Skip to content

Commit 31f9d71

Browse files
author
Alena Prokharchyk
committed
Merge branch 'master' into vpc
Conflicts: server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
2 parents f2078af + 57927c9 commit 31f9d71

1,123 files changed

Lines changed: 17506 additions & 14878 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.

‎build/build-cloud-plugins.xml‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,9 @@
184184
</path>
185185

186186

187-
<target name="compile-plugins" description="Compile all of the jars corresponding to plugins" depends="compile-utils, compile-api, compile-core, compile-server, compile-hypervisors, compile-deployment-planners, compile-host-allocators, compile-network-elements, compile-user-authenticators, compile-storage-allocators "/>
187+
<target name="compile-plugins" description="Compile all of the jars corresponding to plugins" depends="compile-utils, compile-api, compile-core, compile-server, compile-hypervisors, compile-deployment-planners, compile-host-allocators, compile-network-elements, compile-user-authenticators, compile-storage-allocators, compile-file-systems "/>
188188

189-
<target name="build-plugins" depends="build-hypervisors, build-network-elements, build-deployment-planners, build-host-allocators, build-storage-allocators, build-user-authenticators" description="Builds all jar's for the plug-in's"/>
189+
<target name="build-plugins" depends="build-hypervisors, build-network-elements, build-deployment-planners, build-host-allocators, build-storage-allocators, build-user-authenticators, build-file-systems" description="Builds all jar's for the plug-in's"/>
190190

191191
<target name="clean-plugins" description="Clean all of the generated files by the plugins">
192192
<delete file="${build.log}" />
@@ -279,8 +279,8 @@
279279

280280
<!-- ===================== Network Elements ===================== -->
281281

282-
<target name="compile-network-elements" depends="compile-netscaler, compile-f5, compile-srx, compile-ovs" description="Compile all network elements"/>
283-
<target name="build-network-elements" depends="build-netscaler, build-f5, build-srx, build-ovs" description="build all network elements"/>
282+
<target name="compile-network-elements" depends="compile-netscaler, compile-f5, compile-srx, compile-ovs, compile-elb" description="Compile all network elements"/>
283+
<target name="build-network-elements" depends="build-netscaler, build-f5, build-srx, build-ovs, build-elb" description="build all network elements"/>
284284

285285
<target name="compile-netscaler" depends="-init, compile-server" description="Compile NetScaler plugin">
286286
<ant antfile="${base.dir}/plugins/network-elements/netscaler/build.xml" target="build"/>
@@ -302,4 +302,21 @@
302302
</target>
303303
<target name="build-ovs" depends="compile-ovs"/>
304304

305+
<target name="compile-elb" depends="-init, compile-server" description="Compile ELB plugin">
306+
<ant antfile="${base.dir}/plugins/network-elements/elastic-loadbalancer/build.xml" target="build"/>
307+
</target>
308+
<target name="build-elb" depends="compile-elb"/>
309+
310+
311+
<!-- ===================== File Systems ===================== -->
312+
313+
<target name="compile-file-systems" depends="compile-netapp" description="Compils all supported file systems"/>
314+
<target name="build-file-systems" depends="build-netapp" description="Builds all supported file systems"/>
315+
316+
<target name="compile-netapp" depends="-init, compile-server" description="Compile NetApp plugin">
317+
<ant antfile="${base.dir}/plugins/file-systems/netapp/build.xml" target="build"/>
318+
</target>
319+
<target name="build-netapp" depends="compile-netapp"/>
320+
321+
305322
</project>

‎client/tomcatconf/components.xml.in‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@
161161
</adapters>
162162
<manager name="VmwareManager" key="com.cloud.hypervisor.vmware.manager.VmwareManager" class="com.cloud.hypervisor.vmware.manager.VmwareManagerImpl"/>
163163
<manager name="OvsTunnelManager" key="com.cloud.network.ovs.OvsTunnelManager" class="com.cloud.network.ovs.OvsTunnelManagerImpl"/>
164+
<manager name="ElasticLoadBalancerManager" key="com.cloud.network.lb.ElasticLoadBalancerManager" class="com.cloud.network.lb.ElasticLoadBalancerManagerImpl"/>
164165
<pluggableservice name="VirtualRouterElementService" key="com.cloud.network.element.VirtualRouterElementService" class="com.cloud.network.element.VirtualRouterElement"/>
165166
<pluggableservice name="NetscalerExternalLoadBalancerElementService" key="com.cloud.network.element.NetscalerLoadBalancerElementService" class="com.cloud.network.element.NetscalerElement"/>
166167
<pluggableservice name="F5ExternalLoadBalancerElementService" key="com.cloud.network.element.F5ExternalLoadBalancerElementService" class="com.cloud.network.element.F5ExternalLoadBalancerElement"/>
@@ -170,6 +171,11 @@
170171
<dao name="CiscoNexusVSMDeviceDao" class="com.cloud.network.dao.CiscoNexusVSMDeviceDaoImpl" singleton="false"/>
171172
<dao name="OvsTunnelInterfaceDao" class="com.cloud.network.ovs.dao.OvsTunnelInterfaceDaoImpl" singleton="false"/>
172173
<dao name="OvsTunnelAccountDao" class="com.cloud.network.ovs.dao.OvsTunnelNetworkDaoImpl" singleton="false"/>
174+
<dao name="NetappPool" class="com.cloud.netapp.dao.PoolDaoImpl" singleton="false"/>
175+
<dao name="NetappVolume" class="com.cloud.netapp.dao.VolumeDaoImpl" singleton="false"/>
176+
<dao name="NetappLun" class="com.cloud.netapp.dao.LunDaoImpl" singleton="false"/>
177+
<manager name="NetappManager" key="com.cloud.netapp.NetappManager" class="com.cloud.netapp.NetappManagerImpl"/>
178+
<dao name="ElasticLbVmMapDao" class="com.cloud.network.lb.dao.ElasticLbVmMapDaoImpl" singleton="false"/>
173179
</management-server>
174180

175181
<configuration-server class="com.cloud.server.ConfigurationServerImpl">

‎cloud.spec‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,19 @@ fi
414414
%{_javadir}/%{name}-server.jar
415415
%{_javadir}/%{name}-vmware-base.jar
416416
%{_javadir}/%{name}-ovm.jar
417+
%{_javadir}/%{name}-dp-user-concentrated-pod.jar
418+
%{_javadir}/%{name}-dp-user-dispersing.jar
419+
%{_javadir}/%{name}-host-allocator-random.jar
420+
%{_javadir}/%{name}-plugin-f5.jar
421+
%{_javadir}/%{name}-plugin-netscaler.jar
422+
%{_javadir}/%{name}-plugin-ovs.jar
423+
%{_javadir}/%{name}-plugin-srx.jar
424+
%{_javadir}/%{name}-storage-allocator-random.jar
425+
%{_javadir}/%{name}-user-authenticator-ldap.jar
426+
%{_javadir}/%{name}-user-authenticator-md5.jar
427+
%{_javadir}/%{name}-user-authenticator-plaintext.jar
428+
%{_javadir}/%{name}-vmware.jar
429+
%{_javadir}/%{name}-xen.jar
417430
%config(noreplace) %{_sysconfdir}/%{name}/server/*
418431

419432
%files agent-scripts

‎core/src/com/cloud/agent/IAgentControl.java‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
// Copyright 2012 Citrix Systems, Inc. Licensed under the
2-
// Apache License, Version 2.0 (the "License"); you may not use this
3-
// file except in compliance with the License. Citrix Systems, Inc.
4-
// reserves all rights not expressly granted by the License.
5-
// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
6-
// Unless required by applicable law or agreed to in writing, software
7-
// distributed under the License is distributed on an "AS IS" BASIS,
8-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9-
// See the License for the specific language governing permissions and
10-
// limitations under the License.
11-
//
12-
// Automatically generated by addcopyright.py at 04/03/2012
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
1317
package com.cloud.agent;
1418

1519

‎core/src/com/cloud/agent/IAgentControlListener.java‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
// Copyright 2012 Citrix Systems, Inc. Licensed under the
2-
// Apache License, Version 2.0 (the "License"); you may not use this
3-
// file except in compliance with the License. Citrix Systems, Inc.
4-
// reserves all rights not expressly granted by the License.
5-
// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
6-
// Unless required by applicable law or agreed to in writing, software
7-
// distributed under the License is distributed on an "AS IS" BASIS,
8-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9-
// See the License for the specific language governing permissions and
10-
// limitations under the License.
11-
//
12-
// Automatically generated by addcopyright.py at 04/03/2012
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
1317
package com.cloud.agent;
1418

1519
import com.cloud.agent.api.AgentControlAnswer;

‎core/src/com/cloud/agent/Listener.java‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
// Copyright 2012 Citrix Systems, Inc. Licensed under the
2-
// Apache License, Version 2.0 (the "License"); you may not use this
3-
// file except in compliance with the License. Citrix Systems, Inc.
4-
// reserves all rights not expressly granted by the License.
5-
// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
6-
// Unless required by applicable law or agreed to in writing, software
7-
// distributed under the License is distributed on an "AS IS" BASIS,
8-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9-
// See the License for the specific language governing permissions and
10-
// limitations under the License.
11-
//
12-
// Automatically generated by addcopyright.py at 04/03/2012
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
1317
package com.cloud.agent;
1418

1519
import com.cloud.agent.api.AgentControlAnswer;

‎core/src/com/cloud/agent/RecoveryHandler.java‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
// Copyright 2012 Citrix Systems, Inc. Licensed under the
2-
// Apache License, Version 2.0 (the "License"); you may not use this
3-
// file except in compliance with the License. Citrix Systems, Inc.
4-
// reserves all rights not expressly granted by the License.
5-
// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
6-
// Unless required by applicable law or agreed to in writing, software
7-
// distributed under the License is distributed on an "AS IS" BASIS,
8-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9-
// See the License for the specific language governing permissions and
10-
// limitations under the License.
11-
//
12-
// Automatically generated by addcopyright.py at 04/03/2012
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
1317
package com.cloud.agent;
1418

1519
import com.cloud.agent.api.Command;

‎core/src/com/cloud/agent/StartupCommandProcessor.java‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
// Copyright 2012 Citrix Systems, Inc. Licensed under the
2-
// Apache License, Version 2.0 (the "License"); you may not use this
3-
// file except in compliance with the License. Citrix Systems, Inc.
4-
// reserves all rights not expressly granted by the License.
5-
// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
6-
// Unless required by applicable law or agreed to in writing, software
7-
// distributed under the License is distributed on an "AS IS" BASIS,
8-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9-
// See the License for the specific language governing permissions and
10-
// limitations under the License.
11-
//
12-
// Automatically generated by addcopyright.py at 04/03/2012
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
1317
package com.cloud.agent;
1418

1519
import com.cloud.agent.api.StartupCommand;

‎core/src/com/cloud/agent/api/DirectNetworkUsageAnswer.java‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
// Copyright 2012 Citrix Systems, Inc. Licensed under the
2-
// Apache License, Version 2.0 (the "License"); you may not use this
3-
// file except in compliance with the License. Citrix Systems, Inc.
4-
// reserves all rights not expressly granted by the License.
5-
// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
6-
// Unless required by applicable law or agreed to in writing, software
7-
// distributed under the License is distributed on an "AS IS" BASIS,
8-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9-
// See the License for the specific language governing permissions and
10-
// limitations under the License.
11-
//
12-
// Automatically generated by addcopyright.py at 04/03/2012
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
1317
package com.cloud.agent.api;
1418

1519
import java.util.HashMap;

‎core/src/com/cloud/agent/api/DirectNetworkUsageCommand.java‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
1-
// Copyright 2012 Citrix Systems, Inc. Licensed under the
2-
// Apache License, Version 2.0 (the "License"); you may not use this
3-
// file except in compliance with the License. Citrix Systems, Inc.
4-
// reserves all rights not expressly granted by the License.
5-
// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
6-
// Unless required by applicable law or agreed to in writing, software
7-
// distributed under the License is distributed on an "AS IS" BASIS,
8-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9-
// See the License for the specific language governing permissions and
10-
// limitations under the License.
11-
//
12-
// Automatically generated by addcopyright.py at 04/03/2012
1+
// Licensed to the Apache Software Foundation (ASF) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The ASF licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
1317
package com.cloud.agent.api;
1418

1519
import java.util.Date;

0 commit comments

Comments
 (0)