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
d6c22c42fe
Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
2011-11-10 15:26:39 -08:00
f6fcaa49ec
Merge complete except for virtualnetworkappliancemanager
2011-11-10 15:18:16 -08:00
02adbd4bd3
bug 10617: merging code from branch bug10617
2011-11-10 15:23:48 +05:30
4ea3aaeb18
NaaS: Add checking for gateway service in update network offering
2011-11-09 19:14:16 -08:00
5c1773dd26
NaaS: Add response for VirtualRouterProvider
2011-11-09 18:52:34 -08:00
53a636518f
NAAS: changing sharedsourcenat capability to sourceNat service and changin serviceCapablityList parameter to one level map
2011-11-09 18:44:18 -08:00
47114af94b
NaaS: Add redundant capability for Gateway service
2011-11-09 17:09:46 -08:00
bc86800d30
NaaS: Remove Redundant Virtual Router element
...
Would use capability instead.
2011-11-09 17:09:38 -08:00
9b8f96c06d
NaaS: Merge Role.DHCP_USERDATA and Role.DHCP_FIREWALL_LB_USERDATA to Role.VIRTUAL_ROUTER
2011-11-09 17:09:17 -08:00
79e13ec3f7
Added support for listing networks based on the supported services information
2011-11-09 16:41:15 -08:00
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
0876cbeda7
NaaS: Rename VirtualRouterProviderType
2011-11-09 15:24:28 -08:00
c09b2b94b3
NaaS: Add ElbVm to Virtual Router Provider
2011-11-09 15:23:33 -08:00
b569a11e45
NaaS: Add DHCP and userdata service provider
2011-11-09 15:23:06 -08:00
bf3664574a
Revert the temporary build fix (don't expose ID unneccessarily to outside)
2011-11-09 13:51:10 -08:00
24a6c2f528
Revert the temporary build fix after the root cause in ApiDocWriter is addressed
2011-11-09 13:47:52 -08:00
0353133369
Added ways to acquired ip to network guru
2011-11-09 09:37:22 -08:00
4f263a56b2
fix the build
2011-11-08 19:11:36 -08:00
db991dd8f6
NAAS : adding support for service capabilities to be specified as part of network offering
2011-11-08 13:01:44 -08:00
eac54e3ad4
Don't allow to upgrade networkOfferingId and networkDomain for Shared network offerings
2011-11-08 12:33:28 -08:00
f8319823cc
bug 11880: host status is now in sync
2011-11-08 16:53:58 +05:30
76a3bb7581
Fixed unittest
2011-11-07 16:28:31 -08:00
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
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
104ed0a2a2
Direct network guru takes care of only sourceNatDisabled networks in Advance zone
2011-11-07 10:54:19 -08:00
2ef551874a
Fixed Direct Account specific network creation
2011-11-07 10:53:28 -08:00
17a7b7cda4
listNetworkOfferings: added an ability to filter based on the Services supported
2011-11-07 10:53:28 -08:00
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
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
2b6f3d458e
UUID support for XML responses
2011-11-04 17:38:22 -07:00
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
523da327c6
Fixed the doc for the network offerings
2011-11-04 11:15:22 -07:00
084f861318
bug 11889: use keypair instead of sshkeypair in API response
...
status 11889: resolved fixed
2011-11-04 13:58:27 +05:30
809ad8ce23
Fixed listProjects for regular user
2011-11-03 17:28:42 -07:00
d9c41df1a1
Make console proxy support UUID
2011-11-03 16:24:08 -07:00
a7cf2f412c
turn off log for swift credential
2011-11-03 12:07:28 -07:00
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
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
9e5a733a34
Fixed NPE in updateNetwork - userCaller wasn't passed in to restartNetworkElements call
2011-11-03 10:53:19 -07:00
7e9b210d5c
bug 6745: Fix problems in Async create commands
2011-11-03 07:34:02 -07:00
79e39c20fb
Fixes on merged result
2011-11-03 07:34:01 -07:00
924e556c95
bug 6745: Using UUID instead of integers - for all commands
2011-11-03 07:34:00 -07:00
8d8775b533
bug 6745: Using UUID instead of integers - for Async Jobs
2011-11-03 07:33:58 -07:00
6f14bdc361
bug 6745: Using UUID instead of integers - for System VM s
2011-11-03 07:33:57 -07:00
fa2dd8e93a
bug 6745: Using UUID instead of integers - for VM instances
2011-11-03 07:33:56 -07:00
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
3e20c60d6d
Fixed vm deployment in Basic zone
2011-11-02 17:02:44 -07:00
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
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
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
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
da78937d30
Removed some useless methods
2011-11-01 16:57:22 -07:00
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
be21a5e37c
Don't allow enabling securityGroup service for Isolated networks
2011-11-01 13:09:14 -07:00
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
dd6ed6b108
bug 10330: refactor storage code befor merge clvm code
2011-10-31 20:25:26 -07:00
a43364f0a4
NaaS: Rename virtual_router_elements to virtual_router_provider
2011-10-31 15:59:53 -07:00
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
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
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
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
818df189c5
changes to Create Vlan & Public IPs
2011-10-31 09:53:25 -07:00
6632145c4d
bug 8962: adding file
2011-10-31 17:45:00 +05:30
abb37acbdd
bug 8962: added usage related and resource count related code, changed the API name as suggested. Incorporated relevant review comments
2011-10-31 16:35:42 +05:30
07e44e3a23
bug 11311: change list vm call to provide less info
2011-10-30 16:25:57 +05:30
a572205e3c
Revert "bug 11311: vm summary command initial impl"
...
This reverts commit 0abc7e2ea8b9e222f1927aea72d46240bfe8c534.
2011-10-30 15:13:58 +05:30
f456462443
bug 11311: vm summary command initial impl
2011-10-28 14:07:19 +05:30
b413a625f4
1) replaced joinProject API with updateProjectInvitation api. You can accept/decline the invitataion with this command
...
2) Added deleteProjectInviation command. Can be executed by project admin only
2011-10-27 18:32:00 -07:00
6d5601a84d
Added commands and framework for PhysicalNetwork trafficTypes
2011-10-27 17:32:15 -07:00
d315e57b0e
Renamed "type" to "guestType"
2011-10-27 16:51:42 -07:00
fe0b685e95
Security group is a service now
2011-10-27 16:49:20 -07:00
71b53a3432
Made isSharedSourceNatService a capability of SoureNatService
2011-10-27 16:49:20 -07:00
02ada73d89
NaaS: Make applyIp() as a function of FirewallServiceProvider
2011-10-27 16:45:40 -07:00
e1e96c0bb3
NaaS: Add ServiceProviders
...
Added PortForwardingServiceProvider, StaticNatServiceProvider, rename
PasswordServiceProvider to UserDataServiceProvider(may rename to a better name
later).
Add related function for service providers.
2011-10-27 11:55:10 -07:00
b369e45c78
NaaS: Remove some configure items for virtual router
...
DHCP range, domain name, etc. are the property of network, not virtual router
specific.
The focus of virtual router configuration would on separate enable/disable each
service it provided.
2011-10-27 11:55:03 -07:00
d1141aff7d
Swift : add Swift api
2011-10-27 11:48:48 -07:00
cef30956e9
Merge branch 'newagentmgr'
...
Conflicts:
agent-simulator/src/com/cloud/api/commands/ConfigureSimulator.java
ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java
server/src/com/cloud/agent/manager/AgentManagerImpl.java
server/src/com/cloud/capacity/CapacityManagerImpl.java
server/src/com/cloud/network/F5BigIpManagerImpl.java
server/src/com/cloud/network/JuniperSrxManagerImpl.java
server/src/com/cloud/resource/ResourceManagerImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
utils/src/com/cloud/utils/db/GenericDao.java
2011-10-27 11:09:56 -07:00
a1a0fdc0a3
bug 10588: making sure the vms are synced during a delta also
2011-10-27 15:56:53 +05:30
8ee876a9a2
bug 10405: Added annontation since for API Commands and request parameters. Whenever a new APi or parameter is added since=version should be added
...
status 10405: resolved fixed
2011-10-27 14:18:34 +05:30
d55c827f00
bug 4844: Added length in API parameter annotation. Throw invalid param exception when value of param is greater than length. Default length is 255.
...
status 4844: resolved fixed
2011-10-27 12:46:01 +05:30
f798d9950e
bug 10848: DB upgrade changes for dashboard work
2011-10-27 11:56:23 +05:30
b336a8b813
bug 10774: On removing storage, local storage, cluster handle deletion of corresponding op_host_capacity rows.
2011-10-27 11:23:43 +05:30
6423631522
bug 10893: Adding a new capacity type - Local Primary storage.
2011-10-27 11:22:18 +05:30
4b21650e23
bug 10848: Removing NPE from listCapacity and new alert code. Adding CAPACITY_TYPE_DIRECT_ATTACHED_PUBLIC_IP. Introducing thresholds for vlan and direct attached public ips.
2011-10-27 11:21:50 +05:30
10ea88ad08
bug 10945: Introduce a new capacity called Zone Vlan. Add a flag called 'fetchlatest' in listcapacity which would recompute the capacity and fetch the latest.
2011-10-27 11:20:28 +05:30
9c20c1b1b6
bug 10848: ListCapacity - Full rework. This fixes the pagination logic and the capacities are visible till the cluster level.
2011-10-27 11:18:56 +05:30
95bac58076
Cleanup firewall/pf/lb/vpn rules as a part of networkShutdown
2011-10-26 18:00:22 -07:00
4c1a2f50bd
bug 10837: rename api related to netapp
...
status 10837: resolved fixed
2011-10-26 17:37:04 -07:00
3f7ce01f28
bug 10803: using updatehost api to change secondary storage url, the url need to be nfs://host/path format
...
status 10803: resolved fixed
2011-10-26 16:27:28 -07:00
a48ee9c568
add support for multiple provider instanes per physical network
...
refactor NetworkDevicemanager and ExternalnetworkdeviceManager in to one single manager
2011-10-27 03:07:30 +05:30
b91dce4f8a
Swift: add listtemplate for swift
...
add swift configuration
2011-10-25 20:21:27 -07:00
525a0a7675
1)Changed implementation for restart network: call shutdown/implement methods as a part of it
...
2)Re-apply all existing firewall rules as a part of implement call. TODO: Cleanup all existing rules from the backend (leave them in the DB) as a part of shutdown call
2011-10-25 18:24:24 -07:00
1460f3950e
Bug 9949 - revert VM to template
...
1. able to restore VM from its original template
2. Only allow to restore when VM is running or stopped
3. after restoring, VM state will not change, e.g. running is still running
status 9949: resolved fixed
2011-10-25 13:52:39 -07:00
07591807af
Removing isolationMethods from UpdatePhysicalNetwork API.
2011-10-25 11:39:41 -07:00
510d1dbef7
Swift : upload template to Swift and sync between Swift and secondary storage
2011-10-24 18:48:16 -07:00
780e0efe79
Removing references to DataCenter - providers, using the networkoffering -> providers map instead.
...
TODO:
- Still leaving the provider columns in data_center schema as-is for CloudKit and BareMetal
- ExternalNetworkDeviceMgrImpl still needs to fix the dataCenter.setProviders calls and externalNetworkApplicance usage checks to see if zone has external networking.
2011-10-24 18:06:33 -07:00
766c898504
Changes: DeletePhysicalNetwork changes and Configuring NetworkMgr to hold map of providers -> elements
2011-10-24 18:03:18 -07:00
75c8e33226
Removed guestIpType from network/networkOffering
2011-10-24 17:05:00 -07:00
30f95e638a
Bug 11522 - New agent manager
...
1. get rid of host allocation state
2. remove Updating status from agent status
2011-10-24 16:49:32 -07:00
Sheng Yang
Alex Huang
Naredula Janardhana Reddy
Murali Reddy
Alena Prokharchyk
Kelven Yang
Edison Su
Abhi
alena
frank
prachi
kishan
anthony
root
Nitin
Edison Su