Skip to content
This repository was archived by the owner on Jan 15, 2020. It is now read-only.

Commit 469c4dd

Browse files
wolfencomPrasanna Santhanam
wolfencom
authored and
Prasanna Santhanam
committed
Removing ^M's from code.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
1 parent 21f953f commit 469c4dd

123 files changed

Lines changed: 8418 additions & 8420 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.

‎engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntity.java‎

Lines changed: 44 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -14,48 +14,47 @@
1414
// KIND, either express or implied. See the License for the
1515
// specific language governing permissions and limitations
1616
// under the License.
17-
package org.apache.cloudstack.engine.datacenter.entity.api;
18-
19-
import com.cloud.hypervisor.Hypervisor.HypervisorType;
20-
21-
public interface HostEntity extends DataCenterResourceEntity {
22-
23-
/**
24-
* @return total amount of memory.
25-
*/
26-
Long getTotalMemory();
27-
28-
/**
29-
* @return # of cores in a machine. Note two cpus with two cores each returns 4.
30-
*/
31-
Integer getCpus();
32-
33-
/**
34-
* @return speed of each cpu in mhz.
35-
*/
36-
Long getSpeed();
37-
38-
/**
39-
* @return the pod.
40-
*/
41-
Long getPodId();
42-
43-
/**
44-
* @return availability zone.
45-
*/
46-
long getDataCenterId();
47-
48-
/**
49-
* @return type of hypervisor
50-
*/
51-
HypervisorType getHypervisorType();
52-
53-
/**
54-
* @return the mac address of the host.
55-
*/
56-
String getGuid();
57-
58-
Long getClusterId();
59-
60-
}
61-
17+
package org.apache.cloudstack.engine.datacenter.entity.api;
18+
19+
import com.cloud.hypervisor.Hypervisor.HypervisorType;
20+
21+
public interface HostEntity extends DataCenterResourceEntity {
22+
23+
/**
24+
* @return total amount of memory.
25+
*/
26+
Long getTotalMemory();
27+
28+
/**
29+
* @return # of cores in a machine. Note two cpus with two cores each returns 4.
30+
*/
31+
Integer getCpus();
32+
33+
/**
34+
* @return speed of each cpu in mhz.
35+
*/
36+
Long getSpeed();
37+
38+
/**
39+
* @return the pod.
40+
*/
41+
Long getPodId();
42+
43+
/**
44+
* @return availability zone.
45+
*/
46+
long getDataCenterId();
47+
48+
/**
49+
* @return type of hypervisor
50+
*/
51+
HypervisorType getHypervisorType();
52+
53+
/**
54+
* @return the mac address of the host.
55+
*/
56+
String getGuid();
57+
58+
Long getClusterId();
59+
60+
}

‎engine/api/src/org/apache/cloudstack/engine/rest/service/api/ClusterRestService.java‎

Lines changed: 86 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,86 @@
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-
package org.apache.cloudstack.engine.rest.service.api;
20-
21-
import java.util.List;
22-
23-
import javax.ws.rs.GET;
24-
import javax.ws.rs.POST;
25-
import javax.ws.rs.PUT;
26-
import javax.ws.rs.Path;
27-
import javax.ws.rs.PathParam;
28-
import javax.ws.rs.Produces;
29-
import javax.ws.rs.QueryParam;
30-
31-
import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntity;
32-
import org.apache.cloudstack.engine.service.api.ProvisioningService;
33-
import org.springframework.stereotype.Component;
34-
import org.springframework.stereotype.Service;
35-
36-
@Component
37-
@Service("ClusterRestService")
38-
@Produces("application/json")
39-
public class ClusterRestService {
40-
// @Inject
41-
ProvisioningService _provisioningService;
42-
43-
@GET @Path("/clusters")
44-
public List<ClusterEntity> listAll() {
45-
return null;
46-
}
47-
48-
49-
@GET @Path("/cluster/{clusterid}")
50-
public ClusterEntity get(@PathParam("clusterid") String clusterId) {
51-
return null;
52-
}
53-
54-
@POST @Path("/cluster/{clusterid}/enable")
55-
public String enable(@PathParam("clusterid") String clusterId) {
56-
return null;
57-
}
58-
59-
@POST @Path("/cluster/{clusterid}/disable")
60-
public String disable(@PathParam("clusterid") String clusterId) {
61-
return null;
62-
}
63-
64-
@POST @Path("/cluster/{clusterid}/deactivate")
65-
public String deactivate(@PathParam("clusterid") String clusterId) {
66-
return null;
67-
}
68-
69-
@POST @Path("/cluster/{clusterid}/reactivate")
70-
public String reactivate(@PathParam("clusterid") String clusterId) {
71-
return null;
72-
}
73-
74-
@PUT @Path("/cluster/create")
75-
public ClusterEntity create(
76-
@QueryParam("xid") String xid,
77-
@QueryParam("display-name") String displayName) {
78-
return null;
79-
}
80-
81-
@PUT @Path("/cluster/{clusterid}/update")
82-
public ClusterEntity update(
83-
@QueryParam("display-name") String displayName) {
84-
return null;
85-
}
86-
}
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+
package org.apache.cloudstack.engine.rest.service.api;
20+
21+
import java.util.List;
22+
23+
import javax.ws.rs.GET;
24+
import javax.ws.rs.POST;
25+
import javax.ws.rs.PUT;
26+
import javax.ws.rs.Path;
27+
import javax.ws.rs.PathParam;
28+
import javax.ws.rs.Produces;
29+
import javax.ws.rs.QueryParam;
30+
31+
import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntity;
32+
import org.apache.cloudstack.engine.service.api.ProvisioningService;
33+
import org.springframework.stereotype.Component;
34+
import org.springframework.stereotype.Service;
35+
36+
@Component
37+
@Service("ClusterRestService")
38+
@Produces("application/json")
39+
public class ClusterRestService {
40+
// @Inject
41+
ProvisioningService _provisioningService;
42+
43+
@GET @Path("/clusters")
44+
public List<ClusterEntity> listAll() {
45+
return null;
46+
}
47+
48+
49+
@GET @Path("/cluster/{clusterid}")
50+
public ClusterEntity get(@PathParam("clusterid") String clusterId) {
51+
return null;
52+
}
53+
54+
@POST @Path("/cluster/{clusterid}/enable")
55+
public String enable(@PathParam("clusterid") String clusterId) {
56+
return null;
57+
}
58+
59+
@POST @Path("/cluster/{clusterid}/disable")
60+
public String disable(@PathParam("clusterid") String clusterId) {
61+
return null;
62+
}
63+
64+
@POST @Path("/cluster/{clusterid}/deactivate")
65+
public String deactivate(@PathParam("clusterid") String clusterId) {
66+
return null;
67+
}
68+
69+
@POST @Path("/cluster/{clusterid}/reactivate")
70+
public String reactivate(@PathParam("clusterid") String clusterId) {
71+
return null;
72+
}
73+
74+
@PUT @Path("/cluster/create")
75+
public ClusterEntity create(
76+
@QueryParam("xid") String xid,
77+
@QueryParam("display-name") String displayName) {
78+
return null;
79+
}
80+
81+
@PUT @Path("/cluster/{clusterid}/update")
82+
public ClusterEntity update(
83+
@QueryParam("display-name") String displayName) {
84+
return null;
85+
}
86+
}

‎engine/api/src/org/apache/cloudstack/engine/rest/service/api/NetworkRestService.java‎

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,62 @@
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-
package org.apache.cloudstack.engine.rest.service.api;
20-
21-
import java.util.List;
22-
23-
import javax.ws.rs.GET;
24-
import javax.ws.rs.POST;
25-
import javax.ws.rs.PUT;
26-
import javax.ws.rs.Path;
27-
import javax.ws.rs.PathParam;
28-
import javax.ws.rs.Produces;
29-
import javax.ws.rs.QueryParam;
30-
31-
import org.apache.cloudstack.engine.cloud.entity.api.NetworkEntity;
32-
import org.springframework.stereotype.Component;
33-
import org.springframework.stereotype.Service;
34-
35-
@Service("NetworkRestService")
36-
@Component
37-
@Produces("application/json")
38-
public class NetworkRestService {
39-
@PUT @Path("/network/create")
40-
public NetworkEntity create(
41-
@QueryParam("xid") String xid,
42-
@QueryParam("display-name") String displayName) {
43-
return null;
44-
}
45-
46-
@GET @Path("/network/{network-id}")
47-
public NetworkEntity get(@PathParam("network-id") String networkId) {
48-
return null;
49-
}
50-
51-
@GET @Path("/networks")
52-
public List<NetworkEntity> listAll() {
53-
return null;
54-
}
55-
56-
@POST @Path("/network/{network-id}/")
57-
public String deploy(@PathParam("network-id") String networkId) {
58-
return null;
59-
}
60-
61-
62-
}
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+
package org.apache.cloudstack.engine.rest.service.api;
20+
21+
import java.util.List;
22+
23+
import javax.ws.rs.GET;
24+
import javax.ws.rs.POST;
25+
import javax.ws.rs.PUT;
26+
import javax.ws.rs.Path;
27+
import javax.ws.rs.PathParam;
28+
import javax.ws.rs.Produces;
29+
import javax.ws.rs.QueryParam;
30+
31+
import org.apache.cloudstack.engine.cloud.entity.api.NetworkEntity;
32+
import org.springframework.stereotype.Component;
33+
import org.springframework.stereotype.Service;
34+
35+
@Service("NetworkRestService")
36+
@Component
37+
@Produces("application/json")
38+
public class NetworkRestService {
39+
@PUT @Path("/network/create")
40+
public NetworkEntity create(
41+
@QueryParam("xid") String xid,
42+
@QueryParam("display-name") String displayName) {
43+
return null;
44+
}
45+
46+
@GET @Path("/network/{network-id}")
47+
public NetworkEntity get(@PathParam("network-id") String networkId) {
48+
return null;
49+
}
50+
51+
@GET @Path("/networks")
52+
public List<NetworkEntity> listAll() {
53+
return null;
54+
}
55+
56+
@POST @Path("/network/{network-id}/")
57+
public String deploy(@PathParam("network-id") String networkId) {
58+
return null;
59+
}
60+
61+
62+
}

0 commit comments

Comments
 (0)