Skip to content

Commit 48e08fe

Browse files
minchen07minchen07
committed
Merge branch 'master' into rbac.
2 parents 695d689 + 63e3eea commit 48e08fe

1,189 files changed

Lines changed: 33536 additions & 19120 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.

‎agent/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-agent.in‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@
2424

2525
. /etc/rc.d/init.d/functions
2626

27-
whatami=cloud-agent
28-
2927
# set environment variables
3028

31-
SHORTNAME="$whatami"
32-
PIDFILE=@PIDDIR@/"$whatami".pid
29+
SHORTNAME="$0"
30+
PIDFILE=@PIDDIR@/"$SHORTNAME".pid
3331
LOCKFILE=@LOCKDIR@/"$SHORTNAME"
3432
LOGFILE=@AGENTLOG@
3533
PROGNAME="Cloud Agent"
@@ -114,7 +112,7 @@ case "$1" in
114112
fi
115113
;;
116114
*)
117-
echo $"Usage: $whatami {start|stop|restart|condrestart|status|help}"
115+
echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}"
118116
RETVAL=3
119117
esac
120118

‎agent/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-agent.in‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@
2424

2525
. /etc/rc.d/init.d/functions
2626

27-
whatami=cloud-agent
28-
2927
# set environment variables
3028

31-
SHORTNAME="$whatami"
32-
PIDFILE=@PIDDIR@/"$whatami".pid
29+
SHORTNAME="$0"
30+
PIDFILE=@PIDDIR@/"$SHORTNAME".pid
3331
LOCKFILE=@LOCKDIR@/"$SHORTNAME"
3432
LOGFILE=@AGENTLOG@
3533
PROGNAME="Cloud Agent"
@@ -114,7 +112,7 @@ case "$1" in
114112
fi
115113
;;
116114
*)
117-
echo $"Usage: $whatami {start|stop|restart|condrestart|status|help}"
115+
echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}"
118116
RETVAL=3
119117
esac
120118

‎agent/distro/opensuse/sles/SYSCONFDIR/init.d/cloud-agent.in‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,10 @@
3131
. /lib/lsb/init-functions
3232
. /etc/rc.status
3333

34-
whatami=cloud-agent
35-
3634
# set environment variables
3735

38-
SHORTNAME="$whatami"
39-
PIDFILE=@PIDDIR@/"$whatami".pid
36+
SHORTNAME="$0"
37+
PIDFILE=@PIDDIR@/"$SHORTNAME".pid
4038
LOCKFILE=@LOCKDIR@/"$SHORTNAME"
4139
LOGFILE=@AGENTLOG@
4240
PROGNAME="Cloud Agent"
@@ -166,7 +164,7 @@ case "$1" in
166164
start
167165
;;
168166
*)
169-
echo $"Usage: $whatami {start|stop|restart|status|help}"
167+
echo $"Usage: $SHORTNAME {start|stop|restart|status|help}"
170168
RETVAL=3
171169
esac
172170

‎agent/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-agent.in‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@
2424

2525
. /etc/rc.d/init.d/functions
2626

27-
whatami=cloud-agent
28-
2927
# set environment variables
3028

31-
SHORTNAME="$whatami"
32-
PIDFILE=@PIDDIR@/"$whatami".pid
29+
SHORTNAME="$0"
30+
PIDFILE=@PIDDIR@/"$SHORTNAME".pid
3331
LOCKFILE=@LOCKDIR@/"$SHORTNAME"
3432
LOGFILE=@AGENTLOG@
3533
PROGNAME="Cloud Agent"
@@ -114,7 +112,7 @@ case "$1" in
114112
fi
115113
;;
116114
*)
117-
echo $"Usage: $whatami {start|stop|restart|condrestart|status|help}"
115+
echo $"Usage: $SHORTNAME {start|stop|restart|condrestart|status|help}"
118116
RETVAL=3
119117
esac
120118

‎agent/distro/sles/SYSCONFDIR/init.d/cloud-agent.in‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,10 @@
3131
. /lib/lsb/init-functions
3232
. /etc/rc.status
3333

34-
whatami=cloud-agent
35-
3634
# set environment variables
3735

38-
SHORTNAME="$whatami"
39-
PIDFILE=@PIDDIR@/"$whatami".pid
36+
SHORTNAME="$0"
37+
PIDFILE=@PIDDIR@/"$SHORTNAME".pid
4038
LOCKFILE=@LOCKDIR@/"$SHORTNAME"
4139
LOGFILE=@AGENTLOG@
4240
PROGNAME="Cloud Agent"
@@ -166,7 +164,7 @@ case "$1" in
166164
start
167165
;;
168166
*)
169-
echo $"Usage: $whatami {start|stop|restart|status|help}"
167+
echo $"Usage: $SHORTNAME {start|stop|restart|status|help}"
170168
RETVAL=3
171169
esac
172170

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,7 @@ public class EventTypes {
455455

456456
public static final String EVENT_UCS_ASSOCIATED_PROFILE = "UCS.ASSOCIATEPROFILE";
457457

458+
// IAM events
458459
public static final String EVENT_IAM_POLICY_CREATE = "IAMPOLICY.CREATE";
459460
public static final String EVENT_IAM_POLICY_DELETE = "IAMPOLICY.DELETE";
460461
public static final String EVENT_IAM_POLICY_GRANT = "IAMPOLICY.GRANT";

‎api/src/com/cloud/network/IpAddress.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,6 @@ enum Purpose {
8585

8686
Long getNetworkId();
8787

88+
boolean isDisplay();
89+
8890
}

‎api/src/com/cloud/network/NetworkService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public interface NetworkService {
5050

5151
List<? extends Network> getIsolatedNetworksOwnedByAccountInZone(long zoneId, Account owner);
5252

53-
IpAddress allocateIP(Account ipOwner, long zoneId, Long networkId) throws ResourceAllocationException, InsufficientAddressCapacityException,
53+
IpAddress allocateIP(Account ipOwner, long zoneId, Long networkId, Boolean displayIp) throws ResourceAllocationException, InsufficientAddressCapacityException,
5454
ConcurrentOperationException;
5555

5656
boolean releaseIpAddress(long ipAddressId) throws InsufficientAddressCapacityException;
@@ -177,5 +177,5 @@ Network createPrivateNetwork(String networkName, String displayText, long physic
177177

178178
Map<Network.Capability, String> getNetworkOfferingServiceCapabilities(NetworkOffering offering, Service service);
179179

180-
IpAddress updateIP(Long id, String customId);
180+
IpAddress updateIP(Long id, String customId, Boolean displayIp);
181181
}

‎api/src/com/cloud/network/RemoteAccessVpn.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,6 @@ enum State {
3838
Long getVpcId();
3939

4040
State getState();
41+
42+
boolean isDisplay();
4143
}

‎api/src/com/cloud/network/Site2SiteVpnConnection.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,6 @@ enum State {
4242
public Date getRemoved();
4343

4444
public boolean isPassive();
45+
46+
boolean isDisplay();
4547
}

0 commit comments

Comments
 (0)