Alena Prokharchyk
4cf3ecbed4
Cleaned up commented out code
2011-11-11 09:53:46 -08:00
Naredula Janardhana Reddy
f1b99f4f07
Revert "bug 10617: merging code from branch bug10617"
...
This reverts commit 8bc33448b9220534ba0ddc6c642ffb1e69d5844e.
Conflicts:
server/src/com/cloud/api/ApiResponseHelper.java
2011-11-11 20:23:26 +05:30
kishan
77b710eadf
bug 11889: Revert earlier commit. use sshkeypair instead of keypair in API response
...
status 11889: resolved fixed
reviewed-by: Nitin
2011-11-11 14:12:47 +05:30
Alena Prokharchyk
bfff9ee22c
Fixed list by zoneId in listPhysicalNetworks
2011-11-10 20:46:09 -08:00
Alena Prokharchyk
039e09ce93
* Introduced aclType parameter for createNetwork command (can hold 2 values now: Account and Domain). This parameter defines the access control type to the network object. If it's account -
...
only owner of the network can access it; if it's domain - all accounts in the domain and domain children can have an access.
* aclType replaces 2 old fields: isShared and isDomainSpecific.
* All 2.2.x account specific networks will have aclType=Account; 2.2.x Domain specific networks - aclType=domain; 2.2.x Zone level networks - aclType=Domain with domainId = Root domain id
2011-11-10 18:34:56 -08:00
Sheng Yang
7adedca8a3
NaaS: Update listVirtualRouterElements to accept nspid as parameter
...
Also fix VirtualRouterProviderResponse by adding objectName.
2011-11-10 17:26:11 -08:00
Sheng Yang
bde1f6d2de
Merge branch 'networkasservice'
...
Conflicts:
api/src/com/cloud/api/commands/CreateRedundantVirtualRouterElementCmd.java
api/src/com/cloud/api/commands/CreateVirtualRouterElementCmd.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/network/ExternalNetworkDeviceManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/offerings/NetworkOfferingVO.java
setup/db/create-schema.sql
2011-11-10 16:36:08 -08:00
Alex Huang
d6c22c42fe
Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
2011-11-10 15:26:39 -08:00
Alex Huang
f6fcaa49ec
Merge complete except for virtualnetworkappliancemanager
2011-11-10 15:18:16 -08:00
Naredula Janardhana Reddy
02adbd4bd3
bug 10617: merging code from branch bug10617
2011-11-10 15:23:48 +05:30
Sheng Yang
4ea3aaeb18
NaaS: Add checking for gateway service in update network offering
2011-11-09 19:14:16 -08:00
Sheng Yang
5c1773dd26
NaaS: Add response for VirtualRouterProvider
2011-11-09 18:52:34 -08:00
Murali Reddy
53a636518f
NAAS: changing sharedsourcenat capability to sourceNat service and changin serviceCapablityList parameter to one level map
2011-11-09 18:44:18 -08:00
Sheng Yang
47114af94b
NaaS: Add redundant capability for Gateway service
2011-11-09 17:09:46 -08:00
Sheng Yang
bc86800d30
NaaS: Remove Redundant Virtual Router element
...
Would use capability instead.
2011-11-09 17:09:38 -08:00
Sheng Yang
9b8f96c06d
NaaS: Merge Role.DHCP_USERDATA and Role.DHCP_FIREWALL_LB_USERDATA to Role.VIRTUAL_ROUTER
2011-11-09 17:09:17 -08:00
Alena Prokharchyk
79e13ec3f7
Added support for listing networks based on the supported services information
2011-11-09 16:41:15 -08:00
Alena Prokharchyk
0228bca0c2
Use type instead of guestType in network API response (just the way it was done in 2.2.x)
2011-11-09 15:29:13 -08:00
Sheng Yang
0876cbeda7
NaaS: Rename VirtualRouterProviderType
2011-11-09 15:24:28 -08:00
Sheng Yang
c09b2b94b3
NaaS: Add ElbVm to Virtual Router Provider
2011-11-09 15:23:33 -08:00
Sheng Yang
b569a11e45
NaaS: Add DHCP and userdata service provider
2011-11-09 15:23:06 -08:00
Kelven Yang
bf3664574a
Revert the temporary build fix (don't expose ID unneccessarily to outside)
2011-11-09 13:51:10 -08:00
Kelven Yang
24a6c2f528
Revert the temporary build fix after the root cause in ApiDocWriter is addressed
2011-11-09 13:47:52 -08:00
Alex Huang
0353133369
Added ways to acquired ip to network guru
2011-11-09 09:37:22 -08:00
Edison Su
4f263a56b2
fix the build
2011-11-08 19:11:36 -08:00
Murali Reddy
db991dd8f6
NAAS : adding support for service capabilities to be specified as part of network offering
2011-11-08 13:01:44 -08:00
Alena Prokharchyk
eac54e3ad4
Don't allow to upgrade networkOfferingId and networkDomain for Shared network offerings
2011-11-08 12:33:28 -08:00
Abhi
f8319823cc
bug 11880: host status is now in sync
2011-11-08 16:53:58 +05:30
alena
76a3bb7581
Fixed unittest
2011-11-07 16:28:31 -08:00
alena
3a845d2d75
Keep Service/Provider map per network as well as per networkOffering (to handle the case when there are multiple providers defined for the same service in the network offering, and only one is picked when the network is created)
2011-11-07 16:16:03 -08:00
frank
d6db4a686e
Bug 11313 - Add an account param/detail/map in the XXXAccount API calls
...
status 11313: resolved fixed
2011-11-07 14:24:36 -08:00
alena
104ed0a2a2
Direct network guru takes care of only sourceNatDisabled networks in Advance zone
2011-11-07 10:54:19 -08:00
alena
2ef551874a
Fixed Direct Account specific network creation
2011-11-07 10:53:28 -08:00
alena
17a7b7cda4
listNetworkOfferings: added an ability to filter based on the Services supported
2011-11-07 10:53:28 -08:00
alena
7aab227b37
Added one more default network offering - with guestType=Isolated and with DNS/DHCP/USERDATA services supported
2011-11-07 10:50:42 -08:00
prachi
5f93665a30
- Send network labels to hypervisor recource during processConnect
...
- Create Default physicalnetwork and add traffic types while creating a zone
- DeleteProvider should error out if there are networks using the provider.
- Other validations
2011-11-04 17:57:05 -07:00
Kelven Yang
2b6f3d458e
UUID support for XML responses
2011-11-04 17:38:22 -07:00
Sheng Yang
3051dc2621
NaaS: Discard DhcpElement
...
VirtualRouterElement would do all the job. The difference would be public
network enabled or not.
2011-11-04 14:13:55 -07:00
alena
523da327c6
Fixed the doc for the network offerings
2011-11-04 11:15:22 -07:00
kishan
084f861318
bug 11889: use keypair instead of sshkeypair in API response
...
status 11889: resolved fixed
2011-11-04 13:58:27 +05:30
alena
809ad8ce23
Fixed listProjects for regular user
2011-11-03 17:28:42 -07:00
Kelven Yang
d9c41df1a1
Make console proxy support UUID
2011-11-03 16:24:08 -07:00
anthony
a7cf2f412c
turn off log for swift credential
2011-11-03 12:07:28 -07:00
alena
1fe3bc066b
Allow disassociating sourceNat ip address when SourceNat service is not supported by corresponding network any longer (can be disabled during the network offering upgrade)
2011-11-03 11:45:45 -07:00
frank
92edf56ccc
Bug 7883 - Add support to allow admins to sort templates, isos, offerings...
...
status 7883: resolved fixed
2011-11-03 10:54:00 -07:00
alena
9e5a733a34
Fixed NPE in updateNetwork - userCaller wasn't passed in to restartNetworkElements call
2011-11-03 10:53:19 -07:00
Kelven Yang
7e9b210d5c
bug 6745: Fix problems in Async create commands
2011-11-03 07:34:02 -07:00
Kelven Yang
79e39c20fb
Fixes on merged result
2011-11-03 07:34:01 -07:00
Kelven Yang
924e556c95
bug 6745: Using UUID instead of integers - for all commands
2011-11-03 07:34:00 -07:00
Kelven Yang
8d8775b533
bug 6745: Using UUID instead of integers - for Async Jobs
2011-11-03 07:33:58 -07:00
