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
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
Kelven Yang
6f14bdc361
bug 6745: Using UUID instead of integers - for System VM s
2011-11-03 07:33:57 -07:00
Kelven Yang
fa2dd8e93a
bug 6745: Using UUID instead of integers - for VM instances
2011-11-03 07:33:56 -07:00
Sheng Yang
b646f07f9c
NaaS: Add back service offering ID for network offering
...
It would be used to adjust service offering of virtual router
2011-11-02 19:08:37 -07:00
alena
3e20c60d6d
Fixed vm deployment in Basic zone
2011-11-02 17:02:44 -07:00
alena
f42c9e434f
Basic zone: the System Guest network offering can be created from any Shared Guest network offering.
...
Limitation:
* in order to make the networkOffering choice, only one Shared network has to be Enabled at the moment when Basic zone is being created
2011-11-02 15:44:53 -07:00
Sheng Yang
3fc9b149e4
NaaS: Add portforwarding and staticnat service provider
...
Make them service rather than capability of firewall. Now firewall only means
open/close the port.
2011-11-02 15:18:39 -07:00
prachi
6aa743165a
Changes to support Enable/ Disable services of a service provider added to physical network:
...
- ListSupportedNetworkServiceProvidersCmd will now return Providers along with its element's services and boolean 'canEnableIndividualServices' that indicates if for this Provider services can be enabled/disabled
- add & update NetworkServiceProvider changed to take in the list of services to enable. While adding a provider, if list is null then all services supported by the element are enabled by default.
- ListNetworkServices enhanced to take in a provider name and returns services of that specific provider.
2011-11-01 18:03:55 -07:00
alena
2250dff349
1) Removed tags from the network object
...
2) Get hypervisor tags from the physical network instead.
2011-11-01 17:42:06 -07:00
Alex Huang
da78937d30
Removed some useless methods
2011-11-01 16:57:22 -07:00
alena
9560e92015
physicalNetworkId is optional in createNetwork api. Works as follows:
...
* can be specified for Shared network only
* if not specified for the Shared networks, try to locate it based on the zoneId and tags. If tags is not null, pick up first physicalNetwork from the zone that has matching tags. If tags is null, and there are none/more than 1 physical netwroks in the zone, error out.
2011-11-01 15:49:39 -07:00
alena
be21a5e37c
Don't allow enabling securityGroup service for Isolated networks
2011-11-01 13:09:14 -07:00
alena
80dc2c0b1a
Don't send security group commands to the backend when 1) securtiy group service is disabled in the network offering and 2) security group service provider is supported on the physical network
2011-11-01 12:07:32 -07:00
Edison Su
dd6ed6b108
bug 10330: refactor storage code befor merge clvm code
2011-10-31 20:25:26 -07:00
Sheng Yang
a43364f0a4
NaaS: Rename virtual_router_elements to virtual_router_provider
2011-10-31 15:59:53 -07:00
Sheng Yang
cd3fbf0548
NaaS: Create AddVirtualRouterElementCmd
...
As DhcpElement/VirtualRouterElement/RedundantVirtualRouterElement is decided to
be the service provider of the physical network, this API should be called to
add a new element, with correlated network service provider ID.
Then e.g. ConfigureVirtualRouterElementCmd should be called to configure and
enable the element.
2011-10-31 15:59:44 -07:00
Sheng Yang
00bb63ac67
NaaS: Remove separate configuration fields for virtual router elements
...
The fields are duplicated with network offerings.
2011-10-31 15:59:36 -07:00
anthony
46dac852fa
Merge branch 'swift'
...
Conflicts:
server/src/com/cloud/agent/AgentManager.java
server/src/com/cloud/agent/manager/AgentManagerImpl.java
server/src/com/cloud/host/dao/HostDao.java
server/src/com/cloud/host/dao/HostDaoImpl.java
server/src/com/cloud/resource/ResourceManagerImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
server/src/com/cloud/storage/download/DownloadMonitorImpl.java
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2011-10-31 15:04:48 -07:00
prachi
549c7d2ef9
Added NetworkElement API's isReady() and shutdownProviderInstances() called by NetworkMgr while enabling/shutdown the service provider.
2011-10-31 13:09:54 -07:00
