Skip to content

Commit 9ea90c3

Browse files
author
Kishan Kavala
committed
Merge branch 'master' into regions
Conflicts: client/tomcatconf/components.xml.in server/src/com/cloud/api/ApiResponseHelper.java
2 parents a33d8f9 + 96c2493 commit 9ea90c3

132 files changed

Lines changed: 5865 additions & 2104 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎INSTALL.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,9 @@ server are available and not blocked by any local firewall. Following ports are
5252
used by Apache CloudStack and its entities:
5353

5454
8787: Apache CloudStack (Tomcat) debug socket
55-
9090, 8250: Apache CloudStack Management Server, User/Client API
55+
9090, 8250, 8080: Apache CloudStack Management Server, User/Client API
5656
8096: User/Client to CloudStack Management Server (unauthenticated)
57+
7080: AWS API Server
5758
3306: MySQL Server
5859
3922, 8250, 80/443, 111/2049, 53: Secondary Storage VM
5960
3922, 8250, 53: Console Proxy VM

‎api/src/com/cloud/agent/api/routing/DhcpEntryCommand.java‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ public class DhcpEntryCommand extends NetworkElementCommand {
2828
String defaultRouter;
2929
String staticRoutes;
3030
String defaultDns;
31-
31+
String vmIp6Address;
32+
String ip6Gateway;
33+
String duid;
3234

3335
protected DhcpEntryCommand() {
3436

@@ -39,14 +41,15 @@ public boolean executeInSequence() {
3941
return true;
4042
}
4143

42-
public DhcpEntryCommand(String vmMac, String vmIpAddress, String vmName) {
44+
public DhcpEntryCommand(String vmMac, String vmIpAddress, String vmName, String vmIp6Address) {
4345
this.vmMac = vmMac;
4446
this.vmIpAddress = vmIpAddress;
4547
this.vmName = vmName;
48+
this.vmIp6Address = vmIp6Address;
4649
}
4750

48-
public DhcpEntryCommand(String vmMac, String vmIpAddress, String vmName, String dns, String gateway) {
49-
this(vmMac, vmIpAddress, vmName);
51+
public DhcpEntryCommand(String vmMac, String vmIpAddress, String vmName, String vmIp6Address, String dns, String gateway, String ip6Gateway) {
52+
this(vmMac, vmIpAddress, vmName, vmIp6Address);
5053
this.dns = dns;
5154
this.gateway = gateway;
5255
}
@@ -102,4 +105,28 @@ public String getDefaultDns() {
102105
public void setDefaultDns(String defaultDns) {
103106
this.defaultDns = defaultDns;
104107
}
108+
109+
public String getIp6Gateway() {
110+
return ip6Gateway;
111+
}
112+
113+
public void setIp6Gateway(String ip6Gateway) {
114+
this.ip6Gateway = ip6Gateway;
115+
}
116+
117+
public String getDuid() {
118+
return duid;
119+
}
120+
121+
public void setDuid(String duid) {
122+
this.duid = duid;
123+
}
124+
125+
public String getVmIp6Address() {
126+
return vmIp6Address;
127+
}
128+
129+
public void setVmIp6Address(String ip6Address) {
130+
this.vmIp6Address = ip6Address;
131+
}
105132
}

‎api/src/com/cloud/dc/Vlan.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,9 @@ public enum VlanType {
4444

4545
public Long getPhysicalNetworkId();
4646

47+
public String getIp6Gateway();
48+
49+
public String getIp6Cidr();
50+
51+
public String getIp6Range();
4752
}

‎api/src/com/cloud/event/EventCategory.java‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
package com.cloud.event;
21+
22+
import java.util.ArrayList;
23+
import java.util.List;
24+
25+
public class EventCategory {
26+
private static List<EventCategory> eventCategories = new ArrayList<EventCategory>();
27+
private String eventCategoryName;
28+
29+
public EventCategory(String categoryName) {
30+
this.eventCategoryName = categoryName;
31+
eventCategories.add(this);
32+
}
33+
34+
public String getName() {
35+
return eventCategoryName;
36+
}
37+
38+
public static List<EventCategory> listAllEventCategories() {
39+
return eventCategories;
40+
}
41+
42+
public static EventCategory getEventCategory(String categoryName) {
43+
for (EventCategory category : eventCategories) {
44+
if (category.getName().equalsIgnoreCase(categoryName)) {
45+
return category;
46+
}
47+
}
48+
return null;
49+
}
50+
51+
public static final EventCategory ACTION_EVENT = new EventCategory("ActionEvent");
52+
public static final EventCategory ALERT_EVENT = new EventCategory("AlertEvent");
53+
public static final EventCategory USAGE_EVENT = new EventCategory("UsageEvent");
54+
public static final EventCategory RESOURCE_STATE_CHANGE_EVENT = new EventCategory("ResourceStateEvent");
55+
}

0 commit comments

Comments
 (0)