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
frank
56d3d04db4
Baremetal: bypass HA, only track VM status
2011-11-01 15:14:16 -07:00
alena
caefd11d2c
Network offering upgrade is allowed for Isolated networks only
2011-11-01 13:13:01 -07:00
alena
be21a5e37c
Don't allow enabling securityGroup service for Isolated networks
2011-11-01 13:09:14 -07:00
alena
346a6fe80a
Fixed NPE.
2011-11-01 12:07:32 -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
kishan
a4e5e4de45
bug 11796: Catch all exceptions in network usage task and never exit the thread
...
status 11796: resolved fixed
2011-11-01 20:36:29 +05:30
kishan
b1f78bca25
bug 5822, 10783: Use encryption/decryption for queries which use sql directly
...
status 5822, 10783: resolved fixed
2011-11-01 19:30:00 +05:30
kishan
b40742fdae
30 premium upgrade should extend regular upgrade
2011-11-01 18:51:04 +05:30
kishan
18ef8ca3b4
bug 11173: Added usage for VPN users
...
status 11173: resolved fixed
2011-11-01 17:01:48 +05:30
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
Sheng Yang
928fc64ebc
NaaS: Enable VirtualRouterElement to deal with service separately
2011-10-31 15:59:31 -07:00
frank
09fc1be631
revert wrong fix of 24bcb4ddf210fbd4ca6032bb5aa6bd02f7480a73 that built-in templates can not be found
...
The root cause is we didn't return SSVM in connecting status when doing template sync
2011-10-31 15:26:44 -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
anthony
2f1e5504fb
Revert "handle empty snapshot correctly"
...
This reverts commit 99f985783e960d1ef8712c8ff724862f688b461e.
2011-10-31 14:30:09 -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
anthony
42a3f0041a
handle empty snapshot correctly
2011-10-31 11:42:58 -07:00
anthony
9a668416f8
Swift: List ISO fix
2011-10-31 11:10:28 -07:00
prachi
818df189c5
changes to Create Vlan & Public IPs
2011-10-31 09:53:25 -07:00
Murali Reddy
e449067a4a
Bug 9831: Implement resourceCount periodic task that would check if the count in resource_count table matches actual resource count
...
status 9831: resolved fixed
added a periodic task that does recalculation of counts. By default interval is set to 0, which will be interpreted as not to run task
2011-10-31 18:26:21 +05:30
kishan
284ee3909e
bug 9842: Added task to update user stats agg bytes in sync with aggregation range
...
status 9842: resolved fixed
2011-10-31 17:15:36 +05:30
kishan
f34ec52031
Removed unused variable trafficSentinelHostname
2011-10-31 17:13:15 +05:30
Nitin
bbbfdd52ec
bug 10848: Minor fixes.
2011-10-31 17:00:11 +05:30
Abhinandan Prateek
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
Abhinandan Prateek
932e3c3a65
bug 11311: incremental checkin
2011-10-31 12:27:17 +05:30
Abhinandan Prateek
07e44e3a23
bug 11311: change list vm call to provide less info
2011-10-30 16:25:57 +05:30
root
a572205e3c
Revert "bug 11311: vm summary command initial impl"
...
This reverts commit 0abc7e2ea8b9e222f1927aea72d46240bfe8c534.
2011-10-30 15:13:58 +05:30
Nitin
2b370ab535
bug 10657: Introducing cluster level global thresholds for cpu and ram so that these resources do not go beyond these thresholds. The reason for this is because, if the admn needs to provide maintenance, they don't have to add new machines or have ones on standby if the entire zone/pod/cluster is at 100% allocated capacity. Also introducing pool level global thresholds for allocated storage. There are other changes like DB upgrade and introduction of transaction.
2011-10-29 16:51:37 +05:30
anthony
4a3deefd02
Swift : template sync fix
2011-10-28 16:49:24 -07:00
anthony
2b039530c0
Swift : list Template
2011-10-28 16:07:31 -07:00
frank
fec9cc86af
allow multiple clusters for baremetal
2011-10-28 13:47:21 -07:00
frank
1ef620121a
Use constant string instead of hard coding in baremetal parameters passing
...
Conflicts:
server/src/com/cloud/baremetal/BareMetalDiscoverer.java
2011-10-28 11:07:28 -07:00
Nitin
0d1f89f507
bug 10530: Add vmid in the logs
2011-10-28 23:36:07 +05:30
Nitin
5ffbf711fe
bug 11739: Fix typo
2011-10-28 23:33:52 +05:30
alena
7b982efeaa
Fixed Advance zone creation with security group enabled
2011-10-28 10:24:37 -07:00
alena
6445bf4c49
Added services/capabilities to the SecurityGroupElement
2011-10-28 09:52:40 -07:00
Abhinandan Prateek
f456462443
bug 11311: vm summary command initial impl
2011-10-28 14:07:19 +05:30
Abhinandan Prateek
3cb1426a6c
bug 10588: sending cluster sync only for xen
2011-10-28 11:39:22 +05:30
frank
d1084bb383
fix unable to find built-in template
2011-10-27 19:19:19 -07:00
alena
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
frank
eb0fdc2925
allow multiple clusters for baremetal planner
...
fix build
2011-10-27 17:46:54 -07:00
prachi
1583211352
Fixing build after removing physicalNetworkId from createvlanIpRangeCmd
2011-10-27 17:42:42 -07:00
frank
c81477a25c
allow multiple clusters for baremetal planner
...
Conflicts:
server/src/com/cloud/deploy/BareMetalPlanner.java
2011-10-27 17:39:14 -07:00
prachi
6d5601a84d
Added commands and framework for PhysicalNetwork trafficTypes
2011-10-27 17:32:15 -07:00
alena
d315e57b0e
Renamed "type" to "guestType"
2011-10-27 16:51:42 -07:00
alena
fe0b685e95
Security group is a service now
2011-10-27 16:49:20 -07:00
alena
71b53a3432
Made isSharedSourceNatService a capability of SoureNatService
2011-10-27 16:49:20 -07:00
Sheng Yang
02ada73d89
NaaS: Make applyIp() as a function of FirewallServiceProvider
2011-10-27 16:45:40 -07:00
Sheng Yang
bf4e21f315
NaaS: Destroy virtual router when cleanup=true at shutdown
...
As we did in the restart() function.
2011-10-27 16:45:34 -07:00
frank
9e88c40ab0
clean out various interface from agent manager to decent managers
2011-10-27 16:06:51 -07:00
anthony
4116d0d4e4
Swift : bug fix
2011-10-27 16:04:18 -07:00
Sheng Yang
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
Sheng Yang
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
anthony
d1141aff7d
Swift : add Swift api
2011-10-27 11:48:48 -07:00
frank
21de281276
Fix broken compilation by new anget manager merge
2011-10-27 11:24:10 -07:00
frank
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
alena
cb329095b1
When restartNetwork, just shutdown/implement elements and rules, no need to shutdown/implement the network itself.
2011-10-27 10:47:41 -07:00
Abhinandan Prateek
a1a0fdc0a3
bug 10588: making sure the vms are synced during a delta also
2011-10-27 15:56:53 +05:30
kishan
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
kishan
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
Nitin
9027263c42
bug 10848: DB upgrade changes for dashboard work
2011-10-27 11:24:18 +05:30
Nitin
f85d558b6e
bug 10774: Introduce percentage in list commands and cluster id in alert table
2011-10-27 11:23:57 +05:30
Nitin
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
Nitin
70aae9666b
bug 10774: On removing storage, local storage, cluster handle deletion of corresponding op_host_capacity rows.
2011-10-27 11:23:26 +05:30
Nitin
9ba4b7073e
bug 10893: Adding config vlaue conventions.
2011-10-27 11:22:53 +05:30
Nitin
30793ff08b
bug 10893: Adding config vlaue conventions.
2011-10-27 11:22:36 +05:30
Nitin
6423631522
bug 10893: Adding a new capacity type - Local Primary storage.
2011-10-27 11:22:18 +05:30
Nitin
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
Nitin
3921421ce5
bug 10848: listCapacity - sum the used and reserved capacities. Also apply overprovisioning factore explicitly
2011-10-27 11:21:32 +05:30
Nitin
2fc5cc73ba
bug 10945: Start using the new alert system. Also introduce secondarystorage.capacity.threshold
2011-10-27 11:20:59 +05:30
Nitin
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
Nitin
eeb293d48e
bug 8870: Public ip for dashboard would count the public ips only for virtual network.
2011-10-27 11:20:03 +05:30
Nitin
6d9650d26f
bug 10945: Alerts rework. Generate alerts for CPU, RAM and Storage at cluster level., private ips at pod level and public Ip and Sec. Storage at Zone level.
2011-10-27 11:19:43 +05:30
Nitin
1177d5e779
bug 10848: ListCapacity - Adding the real time usage stuff as well.
2011-10-27 11:19:21 +05:30
Nitin
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
Nitin
cfebce78b0
bug 10848: Removing the Host Capacity Checker thread which checks for skipcounting hours and also keeps host's CPU and Memory in sync. This work would be done by capacity checker thread now.
2011-10-27 11:18:25 +05:30
alena
95bac58076
Cleanup firewall/pf/lb/vpn rules as a part of networkShutdown
2011-10-26 18:00:22 -07:00
Edison Su
4c1a2f50bd
bug 10837: rename api related to netapp
...
status 10837: resolved fixed
2011-10-26 17:37:04 -07:00
frank
0e52c5c246
Bug 11522 - New agent manager
...
use exception instead of assert so we can get debug info in customer environment
2011-10-26 17:36:48 -07:00
frank
267216e18e
Bug 11522 - New agent manager
...
better debug message
2011-10-26 17:01:33 -07:00
Edison Su
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
frank
1883afeaa3
Bug 11522 - New agent manager
...
add update count into host table in order to make agent status update atomic
2011-10-26 16:14:57 -07:00
Edison Su
121850bcb5
bug 11598: secstorage.vm.mtu.size, by default it's 1500. After change this configuration, need to restart mgt server, and restart secondary storage to take effect.
...
status 11598: resolved fixed
2011-10-26 14:48:56 -07:00
Murali Reddy
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
anthony
b91dce4f8a
Swift: add listtemplate for swift
...
add swift configuration
2011-10-25 20:21:27 -07:00
Edison Su
193474a595
Storage migration: if it's basic network and migrate to different pod, need to reallocate network
2011-10-25 19:20:18 -07:00
prachi
809f9d965e
Fixed NetworkMgr: getNetworkCapabilities.
...
The key used to get the capabilities from the provider capabilities map was wrong.
2011-10-25 18:51:20 -07:00
alena
96843be30a
Pass cleanup parametet to shutdown() method of the networkElement. Based on this parameter, the element can decide if it wants to destroy the instances, or just shut them down
2011-10-25 18:48:59 -07:00
alena
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
alena
1c430aad44
Check if source nat service is enabled before acquiring the source nat ip address
2011-10-25 18:22:53 -07:00
frank
cfebd04df0
Bug 11805 - Cant add baremetal host
...
status 11805: resolved fixed
2011-10-25 15:18:55 -07:00
frank
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
prachi
07591807af
Removing isolationMethods from UpdatePhysicalNetwork API.
2011-10-25 11:39:41 -07:00
kishan
ca4b1917dd
Revert "bug 4844: Do not allow param values to be greater than length 256"
...
This reverts commit 7598ca07d3b3214e479886e3901df0f0db09f6f1.
2011-10-25 14:22:14 +05:30
anthony
510d1dbef7
Swift : upload template to Swift and sync between Swift and secondary storage
2011-10-24 18:48:16 -07:00
prachi
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
prachi
766c898504
Changes: DeletePhysicalNetwork changes and Configuring NetworkMgr to hold map of providers -> elements
2011-10-24 18:03:18 -07:00
alena
345b1421c8
Allow network offering upgrade for any combination of services
2011-10-24 17:56:34 -07:00
alena
6379c9c61e
Return false when failed to apply the rules on the backend
2011-10-24 17:55:04 -07:00
alena
f6717e0a23
1) Method name change
...
2) Rely on SourceNatService when decide if DirectNetworkGuru and GuestNetworkGuru should handle the network
2011-10-24 17:30:14 -07:00
alena
75c8e33226
Removed guestIpType from network/networkOffering
2011-10-24 17:05:00 -07:00
frank
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
Edison Su
92eaf49f29
Add storage migration
2011-10-24 15:59:47 -07:00
Kelven Yang
fc3d93e3e7
bug 9614: let root volume use IDE disk controller by default to ensure backwards compatibility with existing CloudStack deployments
2011-10-24 15:28:51 -07:00
kishan
e130911371
bug 4844: Do not allow param values to be greater than length 256
...
status 4844: resolved fixed
2011-10-24 18:02:32 +05:30
Abhinandan Prateek
ed2816051a
bug 11354: enabled cache for listBy Dao calls and specifically for listBySecurityGroup
2011-10-24 10:50:44 +05:30
kishan
83b4d2f7f9
bug 5822, 10783: Security enhancements initial checkin. Added encryption support to db.properties and some DB values.
2011-10-24 10:26:02 +05:30
anthony
0df249172d
Swift: DeleteSnapshotBackupCommand and DeleteSnapshotsDirCommand are executed in SSVM
2011-10-21 19:53:48 -07:00
Kelven Yang
443c175793
bug 9614: enable SCSI device controller for root disk.(default root disk controller type can be conifgured through global configuration)
2011-10-21 18:44:56 -07:00
alena
871f1bb6d4
bug 11690: don't allow to remove the cluster when it's referenced by existing storage pools
...
status 11690: resolved fixed
2011-10-21 18:08:18 -07:00
frank
6d95422f34
Bug 11522 - New agent manager
...
get rid of some agent status
2011-10-21 18:06:06 -07:00
anthony
19df7ed8af
Swift; create template from snapshot
2011-10-21 17:32:48 -07:00
alena
1e684beca5
bug 11744: remove firewall rules before removing statis nat rules as a part of disableStaticNat call
...
status 11744: resolved fixed
2011-10-21 17:21:09 -07:00
alena
abca3dda9d
Added ability to list network offerings availabe for network upgrade using listNetworkOfferings command with "networkId" parameter.
...
Limitations:
* can't upgrade to the network offering with lesser number of services
* can upgrade only when the service provider of the original offering is not external (domR, dhcp, elb) to the external type of the provider
2011-10-21 15:36:01 -07:00
anthony
6c5c24dd6b
swift: create volume from template works
2011-10-21 12:53:58 -07:00
Murali Reddy
aa808f5685
-Added LB serive provider (seperating it out from Firewall service provider)
...
-Bringing add/delete/list of all external network devices under one unified API's (addNetworkDevice, deleteNetworkDevice, listNetworkDevice)
-Refactoring External network manager to work from both sets of API's add/delete/list NetworkDevice and add/delete/list External Firewall/LoadBalancer
2011-10-21 18:15:36 +05:30
alena
219978a9be
Create network using physical network id
2011-10-20 18:25:13 -07:00
prachi
0d7ddb5d58
Changes:
...
- Make all API commands Async and add events
- Make BroadcatsDomainRange case insensitive
- Process all _networkElements to build the Service -> Provider map during NetworkMgr::configure()
2011-10-20 17:11:30 -07:00
Sheng Yang
21344e3c36
NaaS: Remove some API test code
2011-10-20 15:19:00 -07:00
Sheng Yang
2ebb719aba
NaaS: Add configuration for virtual router elements
2011-10-20 13:59:23 -07:00
Sheng Yang
fdc354adb5
NaaS: Add VirtualRouterElements table
...
It would cover the configuration of DHCPElement, VirtualRouterElement and
RedundantVirtualRouterElement.
Also add foreign key in domain_router table to reflect the domain_router is
created from which element and use what configuration.
2011-10-20 13:59:02 -07:00
Sheng Yang
04f106a595
NaaS: Configure commands for DhcpElement, VirtualRouterElement and RedundantVirtualRouterElement
...
Add configure command for these virtual router based elements. The commands
should be different for different elements.
The context of configuration would be added later.
2011-10-20 13:58:54 -07:00
alena
51828421f3
Allow upgrade to the offering with a different set of providers
2011-10-20 12:53:14 -07:00
alena
5ffd233bb4
Made all project commands except list* to be Async
2011-10-20 11:30:45 -07:00
David Nalley
8ba007b923
Merge branch 'master' of https://github.com/ke4qqq/CloudStack into ke4qqq-master
2011-10-20 08:16:35 -04:00
prachi
be47d6b4e9
fixing build after the Merge.
2011-10-19 22:49:03 -07:00
prachi
654eaec663
NAAS: Configuring Zone
...
- Create Zone changes and changes to data_center table to remove vlan, securityGroup fields
- Physical Network lifecycle APIs
- Physical Network Service Provider APIs
- DB schema changes
2011-10-19 22:44:03 -07:00
Abhinandan Prateek
1ea9b5d703
bug 10588: putting config param for cluster sync intervals
2011-10-20 10:51:40 +05:30
David Nalley
06e9da180d
Extending Kevin Brook's original XCP disguised as XS 5.6.100 patch
2011-10-19 22:41:33 -04:00
frank
4e595d04ab
Bug 11522 - New agent manager
...
1.load hosts that in maintenance mode because maintenance is no longer an agent status now
2.don't disconnect agent when entering maintenance mode, again it's no longer an agent status now
2011-10-19 17:51:20 -07:00
alena
c5acad39d9
Make Guest Direct security group enabled network offering system by default - we'll make it non-system after getting rid of Basic/Advance zone concepts
2011-10-19 17:34:21 -07:00
alena
ceda05298e
Deprecate guestIpType in networkOffering api. Use type (Shared/Isolated) instead
2011-10-19 16:38:39 -07:00
alena
972caf1936
bug 11777: resolved NPE in listIsos - get domain id from the iso's account owner object
...
status 11777: resolved fixed
2011-10-19 10:43:36 -07:00
anthony
c97010a160
BackupSnapshot to Swift
2011-10-18 18:11:09 -07:00
Kelven Yang
72db00c1c7
bug 11624: command via AgentManagerImpl.sendTo() needs to be redirect to HypervisorGuru for command filtering, the filtering mechanism is required by VMware hypervisor to redirect storage/snapshot commands to SSVM
2011-10-17 18:05:51 -07:00
frank
65f3bb1df5
Bug 11647 - OVM - no support for migrate instance
...
return available hosts when hypervisor type is Ovm
status 11647: resovled fixed
2011-10-17 16:26:32 -07:00
Abhinandan Prateek
f7f2eb825d
bug 10588: incorporated review comments (Reviewer Nitin, Murali, Kishan, Jana)
...
1. Finetune vriable scope, s_ for static vars
2. Impl should be cluster aware and a host going down should not affect the sync
2011-10-17 14:59:24 +05:30
Kelven Yang
693432cb7a
bug 11716: save VMware local datastore info to local storage to support multiple local datastores per host situation
2011-10-14 17:13:58 -07:00
alena
4cb9e30990
Network offering upgrade implementation
2011-10-14 15:03:12 -07:00
frank
49a524ff91
Bug 11745 - Ovm needs user manually start a xenserver user vm in order to start VirtualRouter
...
status 11745: resolved fixed
2011-10-14 14:47:23 -07:00
frank
8decef98fd
Bug 11741 - there is no ovm.public.network.device, ovm.private.network.device, ovm.guest.network.device in global configure page
...
status 11741: resovled fixed
2011-10-14 11:42:54 -07:00
Abhinandan Prateek
81a9358eb7
bug 11675: enable RHEL 6 for XCP 1.1
2011-10-14 11:36:40 +05:30
alena
c00058adc2
Added type (Shared/Isolated) to the networkOffering/networks
2011-10-13 17:33:41 -07:00
frank
5ee1a2456d
Bug 11647 - OVM - no support for migrate instance
...
return error if taking snapshot API call happens on Ovm
2011-10-13 16:20:49 -07:00
anthony
b3e6ab8d1c
add support for XenServer 6.0.0 GA
2011-10-13 15:50:12 -07:00
frank
cd6b872f8d
Bug 11670 - OVM - HA failed when host is disconnected from network
...
status 11670: resolved fixed
2011-10-13 14:46:36 -07:00
alena
2d228dfcbb
Default service provider to VirtualRouter (should make this parameter configurable in the future)
2011-10-12 18:02:35 -07:00
alena
7433d5314a
1) Refactored networkOfferings:
...
* moved all services to the separate table, map them to the network_offering+provider.
* added state/securityGroupEnabled properties for the networkOffering
* added ability to list by state/securityGroupEnabled in listNetworkOfferings api command
2) New service: SourceNat
2011-10-12 16:38:59 -07:00
Nitin
823b80a92e
bug 10848: Change function signatures to accept capacity type as an object..
2011-10-12 16:07:00 +05:30
Abhinandan Prateek
b050120303
bug 10588: clearing map so that the vm sync can resume on next connect, in case of failure
2011-10-12 12:34:54 +05:30
prachi
8570b25506
NAAS: APIServer changes to introduce framework to read commands from pluggable components having separate commands.properties file
...
Changes:
- Added a new interface 'PluggableService'
- Any component that can be packaged separately from cloudstack, can implement this interface and provide its own property file listing the API commands the component supports
- As an example have made VirtualNetworkApplianceService pluggable and a new configureRouter command is added
- ComponentLocator reads all the pluggable service from componentLibrary or from components.xml and instantiates the services.
- As an example, DefaultComponentLibrary adds the pluggable service 'VirtualNetworkApplianceService'
- Also components.xml.in has an entry to show how a pluggable service can be added, but it is commented out.
- APIServer now reads the commands for each pluggable service and when a command for such a service is called, APIServer sets the required instance of the pluggable service in the coomand.
- To do this a new annotation '@PlugService' is added that is processed by APIServer. This eliminates the dependency on the BaseCmd to instantiate the service instances.
2011-10-11 17:34:57 -07:00
Kelven Yang
dce4e74b58
bug 11585: using pre-allocated NIC approach to support additional public interfaces for VMware
2011-10-11 15:40:31 -07:00
Sheng Yang
b2a007dc3c
NaaS: Remove IsServiceProvider() functions
...
If the element is the service provider for this network, then can be tell from
network offering. We don't need these functions in the interface.
2011-10-11 14:04:13 -07:00
Abhinandan Prateek
c6c5e8f557
bug 11675: fixed error messages
2011-10-11 17:23:12 +05:30
root
b5cec5c957
Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
2011-10-11 16:48:39 +05:30
Abhinandan Prateek
930d0a0815
bug 11675: optimized the code
2011-10-11 16:46:15 +05:30
kishan
334eeccd2c
bug 11561: Added new Dao RandomlyIncreasing, which will increase the Vm Id by 1-10 randomly
...
status 11561: resolved fixed
2011-10-11 12:40:50 +05:30
kishan
976b5aa48d
bug 11672: While listing volumes, check for null Vm instance. Log error when Vm instance is null
...
status 11672: resolved fixed
2011-10-11 12:05:37 +05:30
Abhinandan Prateek
ceae8cd365
bug 11675: enabling support for XCP 1.1.0
2011-10-11 11:31:02 +05:30
Sheng Yang
30d48c40b3
Network as a service(NaaS): Separate redundant virtual router as a standalone element
...
Since we would introduce a way to specify each service provider in the network
offering, it's better for redundant virtual router as a separate service
provider.
Also isRedundant() flag in the network offering would be removed. Redundant
virtual router temporality won't work from now. Until we're able to add
different network elements/service providers in network_offering.
2011-10-10 15:41:07 -07:00
Sheng Yang
0121c0516d
Network: Add Service providers
...
In the past, the NetworkElement would cover almost all the functionality that
e.g. virtual router can cover: firewall, source NAT, static NAT, password,
VPN... So anyone want to implement the NetworkElement would have to implement
these service's specific methods, even it wouldn't support it. Also, if we want
to find a e.g. FirewallServiceProvider, we have to proceed all the current
network service providers, to call a method to know if it support such service.
That's neither elegant nor scaling way to do it.
As the first step, this patch separates each ServiceProvider from NetworkElement
(there are some interface already out of NetworkElement, so this patch slightly
modifies them too), and only the class would implement the correlated interface, would
have the ability to do these services.
2011-10-10 11:45:39 -07:00
Edison Su
962bbcd5a0
bug 11634: add manual vm migration support for kvm
...
status 11634: resolved fixed
2011-10-10 11:31:18 -07:00
alena
43bebcd050
Fixed regression bug in listNetworks call (introduced during Project feature implementation)
2011-10-10 10:52:07 -07:00
alena
fdaeb29290
Fixed regression bug in listNetworks call (introduced during Project feature implementation)
2011-10-10 10:51:55 -07:00
Nitin
c16b3eac54
bug 11668: Do not apply 'cpu.overprovisioning.factor' while setting total_cpu in the op_host_capacity entry.
2011-10-10 19:22:49 +05:30
prachi
d59cfab7f3
Bug 11481 - get manual live migration working with all VMs
...
Changes:
- Added the resopnse object name for the SystemVmInstanceResponse that this new MigrateSystemVMCmd will return.
2011-10-07 15:10:42 -07:00
alena
eba6864965
bug 11667: drop primary keys in cloud_usage.usage_load_balancer_policy and cloud_usage.usage_port_forwarding
...
status 11667: resolved fixed
Conflicts:
server/src/com/cloud/user/AccountManagerImpl.java
2011-10-07 11:02:14 -07:00
alena
d399c901c8
bug 11666: fixed foreign key upgrade in networks table
...
status 11666: resolved fixed
2011-10-06 18:15:57 -07:00
alena
143036b4a7
bug 11664: fixed regression bug in listVms introduced by performance changes
...
status 11664: resolved fixed
2011-10-06 16:53:18 -07:00
alena
a17570ef51
1)Implemented Suspend/Activate project
...
2)Email/token based invitation system
2011-10-06 16:10:36 -07:00
frank
93278baa3b
Bug 11522 - New agent manager
...
fix a couple of typos
2011-10-06 14:30:41 -07:00
frank
0f5384d086
Bug 11522 - New agent manager
...
move findxxx interface from HostDao to Managers
2011-10-06 11:56:17 -07:00
frank
24b82a7a89
Bug 11522 - New agent manager
...
call SearchCriteriaService interface instead of SearchCriteria2 instance
2011-10-06 10:32:07 -07:00
prachi
a51fb221d6
Bug 11169 - Couldn't deploy a router because the host it existed on is in Maintenance.
...
Changes:
- VirtualMachineMgr puts the constraint that if Root volume is already READY, we provide the clusterId in the plan to the deploymentPlanner. Planner then searches for resources only under that cluster.
- If no deployment could be found, deploying VM fails.
- Fixed this, such that incase the root volume is recreatable, we call the planner again by removing the cluster constraint. Planner will then search for resources in other clusters.
- Works for system VMs(SSVM, consoleproxy, virual routers).
2011-10-05 18:35:59 -07:00
alena
25c2734e03
More stuff to Projects feature - added support for adding resources (vms, templates, isos) to the project
2011-10-05 13:24:25 -07:00
alena
998568283c
Don't allow to add accounts to the domain of type Project
...
Don't allow to manipulate (delete/update) accounts/domains of type Project
2011-10-05 13:24:25 -07:00
Sheng Yang
e72d38b15d
Revert "bug 11604: Assign guest ip for each router"
...
This reverts commit 42ab3c94c210d5a29289a5dfd0e44ae99c427f8b.
The commit may not fit for our new network as service framework, because we
would make single router and redundant router as two different service provider,
so the change of network offering should clean up the old network and then setup
new one. Make single router work as redundant router later make no sense in such
condition.
2011-10-04 17:58:15 -07:00
Sheng Yang
36511ab6fd
bug 11604: Assign guest ip for each router
...
Then every router would have one guest ip. The gateway ip would be used if the
router is not redundant, otherwise the guest ip would be used for guest network.
2011-10-04 16:24:15 -07:00
Sheng Yang
143ec3a4c5
Clean up priority calcuation/create new mac when create domain router
...
They're unnecessary.
2011-10-04 16:24:06 -07:00
frank
89e04458b6
Bug 11522 - New agent manager
...
move all listxxx interface from HostDao to managers(ResourceManager, SecondaryStorageVmManager etc) with decent name using SearchCriteria2
or direct call SearchCriteria2 on demand
2011-10-04 14:35:26 -07:00
Edison Su
ae83246acb
bug 11600: aquirelock before deleting a volume, which can be aquired by snapshot manager
...
status 11600: resolved fixed
2011-10-03 16:43:47 -07:00
prachi
083b458f03
Bug 11617 - Ensure the Deployment planner is choosing clusters based on aggregate capacity
...
Merge removed this import statement. Adding it back.
2011-10-03 15:46:41 -07:00
prachi
e0a179752d
Bug 11617: Ensure the Deployment planner is choosing clusters based on aggregate capacity
...
Changes:
- We were ordering clusters based on capacity of the first-fit host found in each cluster. Due to this, there were cases where we deployed VMs to one cluster instead of balancing off within clusters.
- Now we order the list of clusters by aggregate capacity and choose the ones that have enough capacity for the required VM in this order.
- This should balance the load between clusters instead of bombarding one.
Conflicts:
server/src/com/cloud/capacity/dao/CapacityDao.java
server/src/com/cloud/capacity/dao/CapacityDaoImpl.java
2011-10-03 15:37:38 -07:00
frank
683113cc38
Bug 11522 - New agent manager
...
get rid of all secondary storage interface from HostDao, instead, put them in
SecondaryStorageVmManager using SearchCriteria2 with decent name
2011-10-03 11:21:34 -07:00
frank
3947c9a126
Bug 11522 - New agent manager
...
Initailize SearchCriteria2 in order to replace search interface of DAO
2011-10-03 10:32:27 -07:00
prachi
9bd5e5871b
Bug 11481 - get manual live migration working with all VMs
...
Changes:
- Added a new API 'migrateSystemVm' backed by MigrateSystemVMCmd.java to migrate system VMs (SSVM, consoleproxy, domain routers(router, LB, DHCP))
- This is Admin only action
- The existing API 'migratevirtualmachine' is only for user VMs
2011-09-29 17:47:46 -07:00
Sheng Yang
b8f8989821
bug 11130: Update template and script version in the database when domR started
2011-09-29 14:51:20 -07:00
anthony
33b1055c01
timeout is not set for some commands
2011-09-29 13:09:05 -07:00
frank
a1193149a0
Bug 11522 - New agent manager
...
renamce updateResourceState to resourceStateTransitTo
2011-09-29 11:58:41 -07:00
alena
53b1b9f63b
bug 11603: for OSS build - update guru_name from GuestNetworkGuru to ExternalGuestNetworkGuru.
...
status 11603: resolved fixed
2011-09-29 10:43:01 -07:00
alena
d7267fb0c5
bug 11589: don't fail deleteVpn command when domR is in Stopped state.
...
status 11589: resolved fixed
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2011-09-29 10:22:14 -07:00
alena
12e25fb988
Implemented vm* api commands to be executed against the project
2011-09-29 10:20:51 -07:00
alena
eda1b53c76
Events for adding/removing project users
2011-09-29 10:20:51 -07:00
Murali Reddy
a623b2824b
bug 6876: netscaler integration
...
added external lb network usage and inline support
2011-09-29 18:59:46 +05:30
anthony
aef74ff521
bug 10579: disable pool vm sync and disable hostTrack for XenServer,
...
status 10579: resolved fixed
reviewed-by: alex
Conflicts:
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
2011-09-28 12:41:24 -07:00
Nitin
b9df06619a
bug 11051: ListPods/ListZones - Apply cpu overprovisioning explicitly as it is not applied when its stored in the db. Also avoid calculating the non shared storage for storage allocated capacity calculation.
2011-09-28 17:48:31 +05:30
kishan
806bfe33c4
bug 11581: During router start, create iptables NETWORK_STATS chain before adding rules for additional public interfaces into that chain
...
status 11581: resolved fixed
reviewed-by: Chiradeep
2011-09-28 16:46:45 +05:30
Nitin
da2696b2f6
bug 11051: ListCluster - Apply cpu overprovisioning explicitly as it is not applied when its stored in the db. Also avoid calculating the non shared storage for storage allocated capacity calculation.
2011-09-28 16:16:28 +05:30
Sheng Yang
1fb5030cca
Clean up global redundant_router config item
...
We would use network_offering option in 3.0 instead.
2011-09-27 16:50:24 -07:00
frank
b188a513ba
Bug 11522 - New agent manager
...
Secondary storage worked
2011-09-27 16:43:26 -07:00
frank
5efaed1d82
Bug 11522 - New agent manager
...
able to add host
2011-09-27 15:18:21 -07:00
frank
e5fca855c1
Bug 11522 - New agent manager
...
register/unregister resource state adapter in configure/stop of implementations
2011-09-27 11:51:03 -07:00
Abhinandan Prateek
83c6cf3db0
bug 10588: code to sync VM state at cluster level and dettached from ping command
2011-09-27 13:18:21 +05:30
alena
ccd47c1b21
Implemented Project Invitations
2011-09-26 17:47:20 -07:00
frank
e8c13e10c7
Bug 11522 - New agent manager
...
able to compile besides mycloud stuff
2011-09-26 16:55:20 -07:00
frank
caa8aaf6fe
Bug 11522 - New agent manager
...
clean up events, status of agent
2011-09-26 15:01:16 -07:00
Kelven Yang
d32241ec9c
bug 10971: support vSphere 5
2011-09-26 12:16:28 -07:00
frank
66c347bec5
Bug 11522 - New agent manager
...
clean up stale functions
2011-09-26 11:29:22 -07:00
frank
e8c3ff653d
Bug 11522 - New agent manager
...
move maintanenceFailed to ResourceManager
2011-09-23 16:54:28 -07:00
frank
bb4237336f
Bug 11522 - New agent manager
...
refine reconnectHost logic
2011-09-23 16:22:14 -07:00
frank
95dbf2ac73
Bug 11522 - New agent manager
...
move updatePassword to ResourceManager
2011-09-23 15:48:06 -07:00
frank
98900717dd
Bug 11522 - New agent manager
...
move umanageHost to ResourceManager
2011-09-23 15:40:52 -07:00
frank
7c5d3597a9
Bug 11522 - New agent manager
...
move cancelMaintenanceMode to ResourceManager
2011-09-23 15:32:58 -07:00
frank
f63e412ac9
Bug 11522 - New agent manager
...
moves migration to ResourceManager
2011-09-23 15:22:39 -07:00
frank
81665757de
Bug 11522 - New agent manager
...
move delete host to ResourceManager
2011-09-23 15:04:44 -07:00
frank
e0e5491c42
Bug 11522 - New agent manager
...
implements ResourceStateAdapter in a couple of components
2011-09-23 11:28:02 -07:00
alena
10308d1ea6
bug 11555: Fixed NPE happening during LB rule cleanup in case when createLB fails
...
status 11555: resolved fixed
Reviewed-by: frank@cloud.com
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2011-09-23 11:02:19 -07:00
alena
a8d3c7436a
bug 11550: rolled back the changes done to ConfigurationServerImpl during the resourceLimit refactor as it was leading to System/Admin account not being inserted to the DB
...
status 11550: resolved fixed
2011-09-23 09:42:07 -07:00
Sheng Yang
b96701a6c4
bug 11541: Change CheckRouterCommand timeout from default 10 minutes to 1 minute
...
Reviewed-by: Anthony Xu
status 11541: resolved fixed
2011-09-22 19:22:33 -07:00
alena
5c35b7f164
1) Resource limits for Projects
...
2) Security checker for Projects
2011-09-22 18:10:35 -07:00
Kelven Yang
2a6de104e2
bug 11531: while taking snapshot on volume, if volume is attached to a VM instance and under VMware, check if there are other ongoing snapshot tasks for the VM instance.
2011-09-22 16:22:12 -07:00
frank
b5e3639263
Bug 11522 - New agent manager
...
replace handleConnect with handleConnectedAgent
2011-09-22 15:07:21 -07:00
Edison Su
ee59c26e93
bug 11513: another customer hits the same issue by associate ip in the basic zone
...
Reviewed-by: alena@citrix.com
2011-09-22 15:04:47 -07:00
Edison Su
211c7099a6
bug 11513: add more log in the cleanup network
...
Reviewed-by:alena@citrix.com
2011-09-22 15:04:43 -07:00
frank
0343cb79c3
Bug 11522 - New agent manager
...
replace simulateStart with createHostAndAgent
2011-09-22 14:42:05 -07:00
alena
a1cab92ae1
bug 11537: revoke related FirewallRules when do vmExpunge and ipAddress release.
...
status 11537: resolved fixed
Reviewed-by: edison@cloud.com
Conflicts:
server/src/com/cloud/network/firewall/FirewallManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2011-09-22 14:01:02 -07:00
frank
0677232e06
Bug 11522 - New agent manager
...
complete ResourceAdapter relevant interface
2011-09-22 11:55:23 -07:00
alena
1561c7d2f9
bug 11468: create ROOT domain and admin user as a part of cloud-setup-databases, not during the management server startup to avoid multiple records insertion for the same domain
...
status 11468: resolved fixed
Reviewed-by: will@cloud.com
Conflicts:
server/src/com/cloud/server/ConfigurationServerImpl.java
2011-09-22 11:01:13 -07:00
kishan
2b9c0a695f
bug 11520: Include TrafficMonitor hosts also while scanning for direct agents to load
...
status 11520: resolved fixed
2011-09-22 13:34:37 +05:30
Sheng Yang
abcf246293
bug 11513: Fix public IP release in advance network
...
We should only persist DomR's public ip, not console proxy and ssvm.
Reviewed-by: Edison
2011-09-21 19:16:41 -07:00
alena
ae56bd11e0
bug 11513: always wrap marking IP address with Releasing state and actual IP deallocation in Transaction
...
Reviewed-by:edison@citrix.com
Conflicts:
server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java
2011-09-21 18:42:47 -07:00
alena
9f9b60a287
1) Added resource limits for the Projects - the same as for the account
...
2) Added "Project" limit type for the Domain object
2011-09-21 17:09:49 -07:00
frank
ce3d810f51
Bug 11522 - New agent manager
...
introduce ResourceState and ResourceStateAdapter
2011-09-21 16:52:39 -07:00
frank
443385471f
Bug 11522 - New agent manager
...
change angent state machine to state machine 2
2011-09-21 16:48:33 -07:00
Edison Su
b1b11a6928
bug 11047: change the put storage pool into maintenance mode: 1. only look at the available storoge pool in its own dc to decide to start vms created on it. 2. if start vm failed, don't throw exception, as these vms are marked stopped already, admin can start these vm by himself.
...
status 11047: resolved fixed
Reviewed-by: frank
2011-09-21 16:20:33 -07:00
alena
4d89066b2c
bug 11515: reapply all firewall rules for the IP address when VPN related rules are being revoked
...
status 11515: resolved fixed
Reviewed-by: will@cloud.com
2011-09-21 09:50:32 -07:00
Nitin
f49578c23a
bug 11051: ListZones - Introduce a flag 'showCapacitites'. When its true it will start displaying all the capacitites (as objects in the response) for the respective zone. Also correcting the summation logic for List cluster, pod and zone commands
2011-09-21 16:59:16 +05:30
alena
a1331d1cfc
Intermidiate checkin to Project feature:
...
1) Introduce new managers - ProjectManager and DomainManager. Moved all domain related code from AccountManager to DomainManager.
2) Moved some code from ManagementServerImpl to the correct managers.
3) New resource limit for Domain - Project
2011-09-20 18:35:28 -07:00
alena
bddc2b9e45
bug 11487: catch all exceptions in cleanupAccount, and mark the account for cleanup when the exception is caught.
...
status 11487: resolved fixed
Reviewed-by: will@cloud.com
2011-09-20 10:33:06 -07:00
alena
b6f58b77b8
bug 11462: 1) when delete PF rule, revoke corresponding firewall first (if exists) 2) never remove PF rule from the table when corresponding firewall rule wasn't removed yet
...
status 11462: resolved fixed
Reviewed-by: edison@cloud.com
Conflicts:
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2011-09-20 10:32:57 -07:00
alena
459b32cc6a
bug 11493: no need to do cross domain checks for the templates as domain level templates are not supported. We support only public (everybody can see and use) and private (only owner can see and use unless changed with updateTemplatePermissions call)
...
status 11493: resolved fixed
Reviewed-by: will@cloud.com
2011-09-20 10:31:57 -07:00
Nitin
7bcbdeb834
bug 11051: ListPods - Introduce a flag 'showCapacitites'. When its true it will start displaying all the capacitites (as objects in the response) for the respective cluster.
2011-09-20 15:59:45 +05:30
Nitin
4a5f6faca2
bug 11051: ListClusters - Introduce a flag 'showCapacitites'. When its true it will start displaying all the capacitites (as objects in the response) for the respective cluster.
2011-09-20 14:33:46 +05:30
Edison Su
a02ae53417
bug 11495: set bootable as user selected for iso/templates
...
status 11495: resolved fixed
Reviewed-by:alena@citrix.com
2011-09-19 17:48:55 -07:00
alena
03bd7d0c96
bug 11480: verify account/user state when do single signon verification
...
status 11480: resolved fixed
Reviewed-by: kelven@cloud.com
2011-09-19 10:57:18 -07:00
alena
ba64010cb5
bug 11470: 1) fixed listResourceLimits 2) Fixed -1 to be treated as unlimited for all the resources
...
status 11470: resolved fixed
2011-09-19 09:47:07 -07:00
prachi
0eea1cb733
Bug 11404 - VM was in Running state, had null for a pod_id, basically didnt allow creation of subsequent vm's
...
Reviewed-by: Alex
Changes:
- When management server starts, it goes through all the pending work items from op_it_work table and schedules HA work for each. It used to mark each item as done. Instead we should keep the item as pending and let it get marked as Done after the HA work is done.
- Changes in VirtualMachineMgr::advanceStop() :
a) if we find a VM with null hostId, we stop the VM only if it is forced stopped.
b) if VM state transition to Stopping fails,for state Starting and Migrating we try to find the pending work item and then do cleanup the VM. In case state is Stopping we can cleanup directly.
c) We proceed releasing all resources only if state transitioned to 'Stopping'.
- Changes in HA:
a) Depend on VirtualMachineMgr::advanceStop() in case host is not found to do VM cleanup
- When Vm state between mgmt server and agent syncs from starting -> running, mark any pending work item as done.
Conflicts:
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
2011-09-15 19:06:19 -07:00
alena
117de2a61a
Do agent disconnect when agent rebalance fails
...
Reviewed-by: Alex Huang
2011-09-15 18:37:06 -07:00