Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
try:
if normalRepo:
print "normal repo"
# this litterally throws EVERYTHING away on the repo
# this literally throws EVERYTHING away on the repo
repoDom = parseString(server.discover_repository_db())
for node in repoDom.getElementsByTagName('Repository'):
repoUuid = node.attributes['Uuid']
remoteMount = node.getElementsByTagName('Fs_location')[0].firstChild.nodeValue
localMount = node.getElementsByTagName('Mount_point')[0].firstChild.nodeValue

# there is a "strong" relation between repo's and VMs
# onfortunately there is no reference in the vm.cfg
# unfortunately there is no reference in the vm.cfg
# or any known info in the configuration of the VM
# in which repo it lives....
for dirname, dirnames, filenames in os.walk('%s/VirtualMachines/' % localMount):
Expand Down Expand Up @@ -146,7 +146,7 @@
journalesize = ""

# o2cb is the problem.... /etc/init.d/o2cb
# sets it's config in /etc/sysconfig/o2cb (can be removed)
# sets its config in /etc/sysconfig/o2cb (can be removed)
# dmsetup requires the stopping of o2cb first,
# then the removal of the config, after which dmsetup
# can remove the device from /dev/mapper/
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/com/cloud/api/ApiSessionListener.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class ApiSessionListener implements HttpSessionListener {
private static Map<String, HttpSession> sessions = new ConcurrentHashMap<>();

/**
* @return the internal adminstered session count
* @return the internal administered session count
*/
public static long getSessionCount() {
return sessions.size();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ public boolean replaceNetworkACLForPrivateGw(final NetworkACL acl, final Private
final List<NetworkACLItemVO> aclItems = _networkACLItemDao.listByACL(acl.getId());
if (aclItems == null || aclItems.isEmpty()) {
//Revoke ACL Items of the existing ACL if the new network acl is empty
//Other wise existing rules will not be removed on the router elelment
//Otherwise existing rules will not be removed on the router element
logger.debug("New network ACL is empty. Revoke existing rules before applying ACL");
if (!revokeACLItemsForPrivateGw(gateway)) {
throw new CloudRuntimeException("Failed to replace network ACL. Error while removing existing ACL " + "items for privatewa gateway: " + gateway.getId());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,7 @@ private List<HostVO> discoverHostsFull(final Long dcId, final Long podId, Long c
// VMware only allows adding host to an existing cluster, as we
// already have a lot of information
// in cluster object, to simplify user input, we will construct
// neccessary information here
// necessary information here
final Map<String, String> clusterDetails = _clusterDetailsDao.findDetails(clusterId);
username = clusterDetails.get("username");
assert username != null;
Expand Down Expand Up @@ -2799,7 +2799,7 @@ public void deleteRoutingHost(final HostVO host, final boolean isForced, final b

final StoragePoolVO storagePool = _storageMgr.findLocalStorageOnHost(host.getId());
if (forceDestroyStorage && storagePool != null) {
// put local storage into mainenance mode, will set all the VMs on
// put local storage into maintenance mode, will set all the VMs on
// this local storage into stopped state
if (storagePool.getStatus() == StoragePoolStatus.Up || storagePool.getStatus() == StoragePoolStatus.ErrorInMaintenance) {
try {
Expand Down
6 changes: 3 additions & 3 deletions ui/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# CloudStack UI

A modern role-based progressive CloudStack UI based on VueJS and Ant Design.
A modern role-based progressive CloudStack UI based on Vue.js and Ant Design.

![Screenshot](docs/screenshot-dashboard.png)

Expand Down Expand Up @@ -142,7 +142,7 @@ docker container:

## Documentation

- VueJS Guide: https://vuejs.org/guide/
- Vue.js Guide: https://vuejs.org/guide/
- Vue Ant Design: https://www.antdv.com/docs/vue/introduce/
- UI Developer [Docs](docs)
- JavaScript ES6 Reference: https://www.tutorialspoint.com/es6/
Expand All @@ -152,7 +152,7 @@ docker container:

The UI uses the following:

- [VueJS](https://vuejs.org/)
- [Vue.js](https://vuejs.org/)
- [Ant Design Spec](https://ant.design/docs/spec/introduce)
- [Ant Design Vue](https://vue.ant.design/)
- [Ant Design Pro Vue](https://github.com/sendya/ant-design-pro-vue)
Expand Down
6 changes: 3 additions & 3 deletions ui/docs/development.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# UI Development

The modern CloudStack UI is role-based progressive app that uses VueJS and Ant Design.
The modern CloudStack UI is role-based progressive app that uses Vue.js and Ant Design.

JavaScript, VueJS references:
JavaScript, Vue.js references:
- https://www.w3schools.com/js/
- https://www.geeksforgeeks.org/javascript-tutorial/
- https://vuejs.org/v2/guide/
Expand Down Expand Up @@ -207,7 +207,7 @@ The Resource View has 2 sections:
with the related entities
- DetailsTab to the right which provide the basic details about the resource.

Custom tabs to render custom details, addtional information of the resource
Custom tabs to render custom details, additional information of the resource
The list of fields to be displayed maybe defined as an array
or a function in case we need to selectively (i.e., based on certain
conditions) restrict the view of certain columns. The names specified in the
Expand Down