Commit Graph

30507 Commits

Author SHA1 Message Date
Rajani Karuturi 524fc324bc Merge pull request #1917 from Accelerite/RvRipRel
CLOUDSTACK-9756: Configure to  ignore the ipassoc failure
2017-04-22 21:09:38 +05:30
Rajani Karuturi 0c9ddcb443 Merge pull request #1993 from Accelerite/sharednw
CLOUDSTACK-8931: Fail to deploy VM instance when use.system.public.ips=false
2017-04-22 20:56:27 +05:30
Rajani Karuturi 6f168c8e16 Merge pull request #1957 from Accelerite/CLOUDSTACK-9748
CLOUDSTACK-9748:VPN Users search functionality broken
2017-04-22 20:54:43 +05:30
Rajani Karuturi 9cc3ae8a94 Merge release branch 4.9 to master
* 4.9:
  CLOUDSTACK-9857: With this change if agent dies the systemd will catch it properly and show process as exited
  CLOUDSTACK-9805: Display VR list in network details
  CLOUDSTACK-9356: FIX Cannot add users in VPC VPN
2017-04-20 19:32:20 +05:30
Rajani Karuturi 5fcf648e7e Merge pull request #1903 from ustcweizhou/vpc-vpn-add-user
[4.9] CLOUDSTACK-9356: FIX Cannot add users in VPC VPN
2017-04-20 15:53:00 +05:30
Rajani Karuturi 53b1c5b69e Merge pull request #1886 from Accelerite/trafficsentinel
CLOUDSTACK-9728: Fixed traffic sentinel HTTP 414 error response
2017-04-20 15:44:13 +05:30
Rajani Karuturi d082226d3a Merge pull request #2024 from shapeblue/CLOUDSTACK-9857
CLOUDSTACK-9857: With this change if agent dies the systemd will catc…
2017-04-20 15:43:04 +05:30
Rajani Karuturi 6e93ca1f7d Merge pull request #1935 from nvazquez/deleteDomainFix
CLOUDSTACK-9764: Delete domain failure due to Account Cleanup task
2017-04-20 15:41:41 +05:30
Rajani Karuturi e27ee22d23 Merge pull request #1889 from Accelerite/CLOUDSTACK-9718
CLOUDSTACK-9718: Revamp the dropdown showing lists of hosts available for migration in a Zone
2017-04-20 15:38:51 +05:30
Rajani Karuturi a4dd6bdeeb Merge pull request #1955 from myENA/virtio-scsi
CLOUDSTACK-8239 Add VirtIO SCSI support for KVM hosts
2017-04-20 15:36:34 +05:30
Rajani Karuturi 5dd814ae70 Merge pull request #1980 from shapeblue/vr-ui-tab
CLOUDSTACK-9805: Display VR list in network details
2017-04-20 15:29:59 +05:30
Rohit Yadav fb1afb1a70 Merge pull request #2051 from shapeblue/master-fix-midonet-changes
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2017-04-19 12:59:37 +05:30
Rohit Yadav 579c7213a7 cloudutils: Fix regression from PR#2033
This fixes regression from PR #2033 which breaks cloudstack deployment
for centos6/7.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2017-04-19 12:54:09 +05:30
Rohit Yadav 248cecd2be CLOUDSTACK-9858: remove midonet plugin dependency on client packaging
This fixes packaging/build regression from #2036

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2017-04-18 19:48:24 +05:30
Rajani Karuturi d96b3cd19c Merge release branch 4.9 to master
* 4.9:
  CLOUDSTACK-9876: Removed test test_01_test_vm_volume_snapshot as we no longer have that restriction and now after fix for CLOUDSTACK-8663 we allow VM and volume snapshots to exist together
2017-04-18 15:17:00 +05:30
Rajani Karuturi 41b7eee2cb Merge pull request #2043 from anshul1886/CLOUDSTACK-9876
CLOUDSTACK-9876: Removed test test_01_test_vm_volume_snapshot
2017-04-18 15:12:02 +05:30
Wido den Hollander b8dd08c362 Merge pull request #2036 from rafaelweingartner/midoneDisablingForRetirement
[CLOUDSTACK-9858] Retirement of midonet plugin (build disabling)

(This is also a test for me to see if Github merges work properly)
2017-04-17 10:51:55 +02:00
Anshul Gangwar e82a6351a1 CLOUDSTACK-9876: Removed test test_01_test_vm_volume_snapshot as we no longer have that restriction and now after fix for CLOUDSTACK-8663 we allow VM and volume snapshots to exist together 2017-04-17 12:44:44 +05:30
Rajani Karuturi 3f29ace947 Merge pull request #1771 from nitin-maharana/nitin3
CLOUDSTACK-9611: Dedicating a Guest VLAN range to Project does not work.
2017-04-17 10:39:02 +05:30
Rajani Karuturi 5fc97c0620 Merge pull request #2033 from shapeblue/ubuntu1604-fixsystemd-weiz
[master/4.10+] CLOUDSTACK-9462: Support for Ubuntu 14.04/16.04 with tomcat6/tomcat7This extends work from @ustcweizhou from https://github.com/apache/cloudstack/pull/1950 by fixing some build issues to make this work with Ubuntu 14.04 and 16.04.

This closes #1950

* pr/2033:
  CLOUDSTACK-9462: Build packages on Ubuntu 14.04/16.04 and support tomcat6/tomcat7

Signed-off-by: Rajani Karuturi <rajani.karuturi@accelerite.com>
2017-04-14 10:18:44 +05:30
Rajani Karuturi a80c286999 Merge pull request #2023 from Accelerite/CLOUDSTACK-9808
BUG-ID: CLOUDSTACK-9808 Added system Vm upgrade path for LXC and OVM`

> mysql> select id,unique_name,name,type,url,updated,created from vm_template where type='SYSTEM';
> +----+-------------+-------------------------------+--------+-----------------------------------------------------------------------------------------------+---------+---------------------+
> | id | unique_name | name                          | type   | url                                                                                           | updated | created             |
> +----+-------------+-------------------------------+--------+-----------------------------------------------------------------------------------------------+---------+---------------------+
> |  1 | routing-1   | SystemVM Template (XenServer) | SYSTEM | https://download.cloudstack.org/systemvm/4.10/systemvm64template-master-4.10.0-xen.vhd.bz2    | NULL    | 2017-03-30 15:53:00 |
> |  3 | routing-3   | SystemVM Template (KVM)       | SYSTEM | https://download.cloudstack.org/systemvm/4.10/systemvm64template-master-4.10.0-kvm.qcow2.bz2  | NULL    | 2017-03-30 15:53:00 |
> |  8 | routing-8   | SystemVM Template (vSphere)   | SYSTEM | https://download.cloudstack.org/systemvm/4.10/systemvm64template-master-4.10.0-vmware.ova     | NULL    | 2017-03-30 15:53:00 |
> |  9 | routing-9   | SystemVM Template (HyperV)    | SYSTEM | https://download.cloudstack.org/systemvm/4.10/systemvm64template-master-4.10.0-hyperv.vhd.zip | NULL    | 2017-03-30 15:53:00 |
> | 10 | routing-10  | SystemVM Template (LXC)       | SYSTEM | https://download.cloudstack.org/systemvm/4.10/systemvm64template-master-4.10.0-kvm.qcow2.bz2  | NULL    | 2017-03-30 15:54:13 |
> | 12 | routing-12  | SystemVM Template (Ovm3)      | SYSTEM | https://download.cloudstack.org/systemvm/4.10/systemvm64template-master-4.10.0-ovm.raw.bz2    | NULL    | 2017-03-30 15:55:58 |
> +----+-------------+-------------------------------+--------+-----------------------------------------------------------------------------------------------+---------+---------------------+
> 6 rows in set (0.00 sec)

`

* pr/2023:
  BUG-ID: CLOUDSTACK-9808 Added system Vm upgrade path for LXC and OVM

Signed-off-by: Rajani Karuturi <rajani.karuturi@accelerite.com>
2017-04-14 10:14:53 +05:30
Kishan Kavala df7996924f BUG-ID: CLOUDSTACK-9808 Added system Vm upgrade path for LXC and OVM 2017-04-12 15:08:16 +05:30
Rajani Karuturi d7c5994f03 Merge pull request #2025 from ustcweizhou/4.10-restartnetwork
[4.10-blocker] Fix error in restart network in 4.10.0.0 RCThe PR fixes the error in restart network:
2017-04-04 10:27:39,217 DEBUG [c.c.n.r.NetworkHelperImpl] (API-Job-Executor-2:ctx-08904854 job-29417 ctx-3405d3f2) (logid:19bbd6e6) Router requires upgrade. Unable to send command to router:9784, router template version : Cloudstack Release 4.10.0 Wed Feb 15 05:42:18 UTC 2017, minimal required version : 4.10.0.0

It works after changing minreq.sysvmtemplate.version from 4.10.0.0 to 4.10.0

* pr/2025:
  Fix error in restart network in 4.10.0.0 RC

Signed-off-by: Rajani Karuturi <rajani.karuturi@accelerite.com>
2017-04-12 11:02:44 +05:30
Rajani Karuturi 7b78a22c5e Merge release branch 4.9 to master
* 4.9:
  CLOUDSTACK-9591: Fix guest VM ovf xml to remove network nodes
  CLOUDSTACK-9591: Fix systemvmtemplate to not include network details
2017-04-12 10:30:23 +05:30
Rajani Karuturi 96700a04a9 Merge pull request #2022 from shapeblue/4.9-systemvm-fix-vmware-portgroups
[dvswitch blocker] CLOUDSTACK-9591: Fix systemvmtemplate to not include network detailsThis removes nic/network specific details while exporting the systemvmtemplate for vmware (ova file). Having this causes the ssvms to not deploy in dvswitch-based vmware environments that have no vswitch portgroups (dummy etc). Tested this on a local Trillian env.

* pr/2022:
  CLOUDSTACK-9591: Fix guest VM ovf xml to remove network nodes
  CLOUDSTACK-9591: Fix systemvmtemplate to not include network details

Signed-off-by: Rajani Karuturi <rajani.karuturi@accelerite.com>
2017-04-12 10:05:57 +05:30
Rafael Weingartner a3f351c07e [CLOUDSTACK-9858] Retirement of midonet plugin (build disabling) 2017-04-11 16:04:10 -04:00
nvazquez 60ff09d4f7 CLOUDSTACK-9764: Delete domain failure due to Account Cleanup task 2017-04-07 12:40:56 -03:00
Wei Zhou 4a77a79949 CLOUDSTACK-9462: Build packages on Ubuntu 14.04/16.04 and support tomcat6/tomcat7
Changes
(1) add systemd support in debian/control and debian/rules for 16.04
(2) add python-setuptools in Build-Depends in debian/control
(3) seperate cloudstack-management.service and cloudstack-management.default for CentOS7 and Ubuntu 16.04
(4) add server7-ssl.xml and server7-nonssl.xml in management installation
(5) link /usr/share/cloudstack-management/lib and /usr/share/cloudstack-management/bin to correct path (tomcat6 or tomcat7)
(6) link /etc/cloudstack/management/server.xml to correct file path (server-nonssl.xml or server7-nonssl.xml)
(7) remove *.zip from .gitignore to avoid build error caused by missing /vhds/test.vhd.zip

Instruction
(1) build packages on Ubuntu 16.04: dpkg-buildpackage -uc -us
    Output on Ubuntu 16.04:
-rw-r--r-- 1 root root      4090 Feb 17 10:12 cloudstack_4.10.0.0-SNAPSHOT_amd64.changes
-rw-r--r-- 1 root root      1235 Feb 17 09:53 cloudstack_4.10.0.0-SNAPSHOT.dsc
-rw-r--r-- 1 root root   8018248 Feb 17 09:53 cloudstack_4.10.0.0-SNAPSHOT.tar.xz
-rw-r--r-- 1 root root  91868746 Feb 17 10:11 cloudstack-agent_4.10.0.0-SNAPSHOT_all.deb
-rw-r--r-- 1 root root     52882 Feb 17 10:12 cloudstack-cli_4.10.0.0-SNAPSHOT_all.deb
-rw-r--r-- 1 root root  98556216 Feb 17 10:08 cloudstack-common_4.10.0.0-SNAPSHOT_all.deb
-rw-r--r-- 1 root root     52864 Feb 17 10:12 cloudstack-docs_4.10.0.0-SNAPSHOT_all.deb
-rw-r--r-- 1 root root    585434 Feb 17 10:12 cloudstack-integration-tests_4.10.0.0-SNAPSHOT_all.deb
-rw-r--r-- 1 root root 323459934 Feb 17 10:10 cloudstack-management_4.10.0.0-SNAPSHOT_all.deb
-rw-r--r-- 1 root root    442656 Feb 17 10:12 cloudstack-marvin_4.10.0.0-SNAPSHOT_all.deb
-rw-r--r-- 1 root root  87037576 Feb 17 10:12 cloudstack-usage_4.10.0.0-SNAPSHOT_all.deb

(2) setup tomcat6/tomcat7 on management server:
    tomcat6: cloudstack-setup-management --tomcat6
    tomcat7: cloudstack-setup-management --tomcat7

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2017-04-07 18:41:24 +05:30
Rajani Karuturi 50ffbe905a Merge pull request #2032 from Accelerite/master-fix-after-1944
CLOUDSTACK-9783: corrected the version number in metrics pommaster is broken after fwd-merging metrics PR #1944 from 4.9
This is due to the incorrect parent version number in the metrics pom.
Corrected the same to reflect master version number.

* pr/2032:
  CLOUDSTACK-9783: corrected the version number in metrics pom

Signed-off-by: Rajani Karuturi <rajani.karuturi@accelerite.com>
2017-04-07 11:04:22 +05:30
Rajani Karuturi e1c76dcc23 CLOUDSTACK-9783: corrected the version number in metrics pom
master is broken after fwd-merging metrics PR #1944 from 4.9
This is due to the incorrect parent version number in the metrics pom.
Corrected the same to reflect master version number.
2017-04-07 09:52:27 +05:30
Abhinandan Prateek e5bfffb48c CLOUDSTACK-9857: With this change if agent dies the systemd will catch it properly and show process as exited
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2017-04-06 13:07:53 +05:30
rashmidixit d8158fe5f4 CLOUDSTACK-9718: Revamp the dropdown showing lists of hosts available for migration in a Zone
Reviewed-By: Rashmi Dixit

    Problem: All the hosts suitable for VM Migration are not shown in the UI. This could
    confuse the user as the target host might never be shown in the UI.

    Root Cause: The API (findHostsForMigration) always returned page 1 results which would
    be always <= default.page.size global parameter. Therefore, in case of large
    no. of hosts where the result can map to multiple pages, this issue would arise.

    Solution: 1. Replace drop-down with listView widget.
    2. Allow lazy-loading of records on listView's scroll.
    3. Show additional parameters (CPU/Memory used) to assist admin in decision making.
    4. Provide 'Search by host name' to limit the results.

Added change where if there are no hosts found, an empty row with message will
appear.
2017-04-06 12:31:51 +05:30
Rajani Karuturi 4db186ef6f Merge pull request #1880 from Accelerite/CLOUDSTACK-9720
CLOUDSTACK-9720: [VMware] template_spool_ref table is not getting updated with correct template physical size in template_size column.Updated the template_spool_ref table with the correct template (VMware - OVA file) size.

* pr/1880:
  CLOUDSTACK-9720: [VMware] template_spool_ref table is not getting updated with correct template physical size in template_size column.

Signed-off-by: Rajani Karuturi <rajani.karuturi@accelerite.com>
2017-04-06 12:11:22 +05:30
Rajani Karuturi 5c0979fff5 Merge release branch 4.9 to master
* 4.9:
  CLOUDSTACK-9783: Improve metrics view performance
2017-04-06 12:04:55 +05:30
Rajani Karuturi 6548839417 Merge pull request #1944 from shapeblue/4.9-metrics-enhancement
CLOUDSTACK-9783: Improve metrics view performanceThis improves the metrics view feature by improving the rendering performance
of metrics view tables, by re-implementing the logic at the backend and data
served via APIs. In large environments, the older implementation would
make several API calls that increases both network and database load.

List of APIs introduced for improving the performance that re-implement the frontend logic at backend:

    listClustersMetrics
    listHostsMetrics
    listInfrastructure
    listStoragePoolsMetrics
    listVMsMetrics
    listVolumesMetrics
    listZonesMetrics

Pinging for review - @abhinandanprateek @DaanHoogland @borisstoyanov @karuturi @rashmidixit

Marvin test results:

=== TestName: test_list_clusters_metrics | Status : SUCCESS ===

=== TestName: test_list_hosts_metrics | Status : SUCCESS ===

=== TestName: test_list_infrastructure_metrics | Status : SUCCESS ===

=== TestName: test_list_pstorage_metrics | Status : SUCCESS ===

=== TestName: test_list_vms_metrics | Status : SUCCESS ===

=== TestName: test_list_volumes_metrics | Status : SUCCESS ===

=== TestName: test_list_zones_metrics | Status : SUCCESS ===

* pr/1944:
  CLOUDSTACK-9783: Improve metrics view performance

Signed-off-by: Rajani Karuturi <rajani.karuturi@accelerite.com>
2017-04-06 12:04:29 +05:30
Wei Zhou 5018b579ab Fix error in restart network in 4.10.0.0 RC 2017-04-04 12:43:27 +02:00
Rajani Karuturi 85d073b540 Merge pull request #2021 from nvazquez/CLOUDSTACK-9854
CLOUDSTACK-9854: Fix test_primary_storage test failure due to live migrationFix for test_primary_storage integration tests on simulator.

When finding storage pool migration options for volume on running vm, API returns None as hypervisor doesn't support live migration.

````
2017-03-28 06:07:55,958 - DEBUG - ========Sending GET Cmd : findStoragePoolsForMigration=======
2017-03-28 06:07:55,977 - DEBUG - Response : None
2017-03-28 06:07:55,983 - CRITICAL - EXCEPTION: test_03_migration_options_storage_tags: ['Traceback (most recent call last):\n', '  File "/opt/python/2.7.12/lib/python2.7/unittest/case.py", line 329, in run\n    testMethod()\n', '  File "/home/travis/.local/lib/python2.7/site-packages/marvin/lib/decoratorGenerators.py", line 30, in test_wrapper\n    return test(self, *args, **kwargs)\n', '  File "/home/travis/build/apache/cloudstack/test/integration/smoke/test_primary_storage.py", line 547, in test_03_migration_options_storage_tags\n    pools_suitable = filter(lambda p : p.suitableformigration, pools_response)\n', "TypeError: 'NoneType' object is not iterable\n"]
````

So we simply stop vm before sending findStoragePoolsForMigration command

* pr/2021:
  CLOUDSTACK-9854: Fix test_primary_storage test failure due to live migration

Signed-off-by: Rajani Karuturi <rajani.karuturi@accelerite.com>
2017-03-31 11:29:19 +05:30
nvazquez 11562dca7f CLOUDSTACK-9854: Fix test_primary_storage test failure due to live migration 2017-03-30 15:50:51 -03:00
Rohit Yadav 00e1b462f6 CLOUDSTACK-9591: Fix guest VM ovf xml to remove network nodes
This removes network details from the guest VM template OVF xml before deploying
a VM which would fail in case of dvswitch-based vmware environment with no
dummy/existing vswitch.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2017-03-30 18:01:46 +05:30
Rajani Karuturi 0f0d908292 Merge pull request #2019 from Accelerite/cs-9850
CLOUDSTACK-9851 travis CI build failure after merge of PR#1953 & CLOUDSTACK-9850Fixed travis CI failures happening after merge of PR#1953.
Also fixed root volume detach that was broken after merge of PR#1953.
I found following logs with root volume attach.

`
2017-03-24 23:19:48,380 DEBUG [o.a.c.f.j.i.AsyncJobManagerImpl] (API-Job-Executor-27:ctx-7c53d1bc job-44) (logid:f3b54257) Executing AsyncJobVO {id:44, userId: 2, accountId: 2, instanceType: Volume, instanceId: 3, cmd: org.apache.cloudstack.api.command.admin.volume.AttachVolumeCmdByAdmin, cmdInfo: {"apiKey":"PYHMg5HhOkmTQvlmZSe1dIDfTxl8uwreeFoqfj0a4zPCC-1XTuwH7H5I8Ac9fyvPbtNO1eN9THi72q8ATfs8hg","signature":"DD+ljbVWpWQw6FCl1tCDSYe5Ui0\u003d","httpmethod":"GET","deviceid":"0","ctxAccountId":"2","uuid":"2db57cd8-c96c-48f9-83c5-b9a79c852cc5","cmdEventType":"VOLUME.ATTACH","virtualmachineid":"9cb6a944-8775-4e11-961b-0e8dbdebf5a7","response":"json","ctxUserId":"2","ctxStartEventId":"117","id":"2db57cd8-c96c-48f9-83c5-b9a79c852cc5","ctxDetails":"{\"interface com.cloud.vm.VirtualMachine\":\"9cb6a944-8775-4e11-961b-0e8dbdebf5a7\",\"interface com.cloud.storage.Volume\":\"2db57cd8-c96c-48f9-83c5-b9a79c852cc5\"}"}, cmdVersion: 0, status: IN_PROGRESS, processStatus: 0, resultCode: 0, result: null, initMsid: 4278190080, completeMsid: null, lastUpdated: null, lastPolled: null, created: null }
2017-03-24 23:19:50,160 ERROR [c.c.v.VmWorkJobHandlerProxy] (Work-Job-Executor-15:ctx-489eb1dd job-44/job-45 ctx-cce17070) (logid:f3b54257) Invocation exception, caused by: java.lang.RuntimeException: deviceId should be 1,2,4-5
`

* pr/2019:
  CLOUDSTACK-9851 travis CI build failure after merge of PR#1953

Signed-off-by: Rajani Karuturi <rajani.karuturi@accelerite.com>
2017-03-30 13:48:48 +05:30
Rohit Yadav 92fd5bee3d CLOUDSTACK-9591: Fix systemvmtemplate to not include network details
This removes nic/network specific details while exporting the systemvmtemplate
for vmware (ova file). Having this causes the ssvms to not deploy in
dvswitch-based vmware environments that have no vswitch portgroups (dummy etc).
Tested this on a local Trillian env.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2017-03-30 13:47:53 +05:30
Sudharma Jain 7348f9412a CLOUDSTACK-9851 travis CI build failure after merge of PR#1953 2017-03-30 09:22:58 +05:30
Rajani Karuturi 525c45c1e5 Merge pull request #1994 from nvazquez/CLOUDSTACK-9827
CLOUDSTACK-9827: Storage tags stored in multiple placesIssue description: https://issues.apache.org/jira/browse/CLOUDSTACK-9827

### Fixes
- Create Primary Storage: Persist tags into `storage_pool_tags` instead of `storage_pool_details`
- List Storage Tags: Queries `storage_pool_tags` table instead of `storage_tag_view`
- Find Storage Pools by Tags using proper DAO
- Remove storage tags after deleting Primary Storage
- Remove unused `StorageTagDao`, `StorageTagDaoImpl`, `StorageTagVO` and `storage_tag_view`

* pr/1994:
  CLOUDSTACK-9827: Storage tags stored in multiple places

Signed-off-by: Rajani Karuturi <rajani.karuturi@accelerite.com>
2017-03-28 11:09:56 +05:30
Rajani Karuturi 45dda46fed Merge pull request #1961 from nvazquez/addNewNfsTestData
Fix for test_snapshots.py using nfs2 instead of nfs templateFix for marvin test failure introduced in #1847

Cc: @borisstoyanov @rhtyd @karuturi

* pr/1961:
  Fix for test failure
  Fix for test_snapshots.py using nfs2 instead of nfs template

Signed-off-by: Rajani Karuturi <rajani.karuturi@accelerite.com>
2017-03-28 11:09:30 +05:30
Rohit Yadav 0ddcf0b175 CLOUDSTACK-9805: Display VR list in network details
Displays a VR tab that lists VRs for the network in the detail views for
isolated networks, shared networks and for VPCs.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2017-03-26 14:27:22 +05:30
nvazquez edf0e2b26f CLOUDSTACK-9827: Storage tags stored in multiple places 2017-03-24 13:37:04 -03:00
Rajani Karuturi ec2d4dd422 Merge release branch 4.9 to master
* 4.9:
  CLOUDSTACK-9811: fix duplicated nics on VR caused by nic name p<slot_number>p<port_number>
2017-03-23 15:19:31 +05:30
Rajani Karuturi 9bf428162d Merge pull request #2011 from ustcweizhou/fix-issue-p55p1
CLOUDSTACK-9811: fix duplicated nics on VR caused by nic name p<slot_number>p<port_number>

* pr/2011:
  CLOUDSTACK-9811: fix duplicated nics on VR caused by nic name p<slot_number>p<port_number>

Signed-off-by: Rajani Karuturi <rajani.karuturi@accelerite.com>
2017-03-23 15:18:54 +05:30
Rajani Karuturi 2b0a5ae4b2 Merge pull request #2003 from swill/cs_ip_fix
CLOUDSTACK-9811: fixed an issue if the dev is not in the databagDefend against the specified dev not being in the databag.

* pr/2003:
  changed the order fix to be closer to the original code
  CLOUDSTACK-9811: fixed an issue if the dev is not in the databag

Signed-off-by: Rajani Karuturi <rajani.karuturi@accelerite.com>
2017-03-23 15:16:50 +05:30
Wei Zhou bf93b6313e CLOUDSTACK-9811: fix duplicated nics on VR caused by nic name p<slot_number>p<port_number> 2017-03-20 07:32:31 +01:00