conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
import java.util.ArrayList;
=======
>>>>>>>
import java.util.ArrayList;
<<<<<<<
private long connectionGroupProxyID = 0;
private LoadBalanceExceptionChecker exceptionChecker;
=======
private Map jdbcInterfacesForProxyCache = new HashMap();
private MySQLConnection thisAsConnection = null;
>>>>>>>
private long connectionGroupProxyID = 0;
private LoadBalanceExceptionChecker exceptionChecker;
private Map jdbcInterfacesForProxyCache = new HashMap();
private MySQLConnection thisAsConnection = null;
<<<<<<<
this.exceptionChecker = (LoadBalanceExceptionChecker) Util.loadExtensions(null, props,
lbExceptionChecker, "InvalidLoadBalanceExceptionChecker", null).get(0);
this.exceptionChecker.init(null, props);
=======
thisAsConnection = new LoadBalancedMySQLConnection(this);
>>>>>>>
this.exceptionChecker = (LoadBalanceExceptionChecker) Util.loadExtensions(null, props,
lbExceptionChecker, "InvalidLoadBalanceExceptionChecker", null).get(0);
this.exceptionChecker.init(null, props);
thisAsConnection = new LoadBalancedMySQLConnection(this);
<<<<<<<
this.activePhysicalConnections++;
this.totalPhysicalConnections++;
=======
conn.setProxy(this.thisAsConnection);
>>>>>>>
this.activePhysicalConnections++;
this.totalPhysicalConnections++;
conn.setProxy(this.thisAsConnection);
<<<<<<<
this.lastUsed = System.currentTimeMillis();
result = method.invoke(this.currentConn, args);
=======
result = method.invoke(thisAsConnection, args);
>>>>>>>
this.lastUsed = System.currentTimeMillis();
result = method.invoke(thisAsConnection, args);
<<<<<<<
MySQLConnection thisAsConnection = (MySQLConnection) Proxy
.newProxyInstance(getClass().getClassLoader(),
new Class[] { com.mysql.jdbc.MySQLConnection.class },
this);
this.currentConn.setProxy(thisAsConnection);
=======
>>>>>>> |
<<<<<<<
chartInfo.setInputStreamName( params.get( "input-stream" ) );
logger.debug("All keys "+params.keySet().iterator().next());
=======
if (size == null){
chartInfo.setHistorySize( 10 );
chartInfo.setHistoryIsTime( false );
}else{
Pair<Boolean,Long> p = Utils.parseWindowSize(size);
chartInfo.setHistorySize( p.getSecond().intValue() );
chartInfo.setHistoryIsTime( p.getFirst() );
}
chartInfo.setInputStreamName( params.get( "input-stream" ) );
>>>>>>>
if (size == null){
chartInfo.setHistorySize( 10 );
chartInfo.setHistoryIsTime( false );
}else{
Pair<Boolean,Long> p = Utils.parseWindowSize(size);
chartInfo.setHistorySize( p.getSecond().intValue() );
chartInfo.setHistoryIsTime( p.getFirst() );
}
chartInfo.setInputStreamName( params.get( "input-stream" ) );
logger.debug("All keys "+params.keySet().iterator().next());
<<<<<<<
chartInfo.setHistorySize( ParamParser.getInteger( params.get( "history-size" ) , 10 ) );
logger.debug("Initializing chart input stream name: "+chartInfo.getInputStreamName());
=======
>>>>>>> |
<<<<<<<
import org.zeromq.ZMQ;
import org.zeromq.ZMQ.Context;
=======
//import org.jibx.runtime.BindingDirectory;
//import org.jibx.runtime.IBindingFactory;
//import org.jibx.runtime.IUnmarshallingContext;
//import org.jibx.runtime.JiBXException;
import org.zeromq.ZContext;
>>>>>>>
import org.zeromq.ZContext; |
<<<<<<<
import android.support.design.widget.FloatingActionButton;
=======
import android.database.sqlite.SQLiteConstraintException;
>>>>>>>
import android.support.design.widget.FloatingActionButton;
import android.database.sqlite.SQLiteConstraintException; |
<<<<<<<
this.morphs = new GuiMorphsPopup(6, model.morph, Morphing.get(Minecraft.getMinecraft().player));
}
=======
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
>>>>>>>
EntityPlayer player = Minecraft.getMinecraft().player;
<<<<<<<
cell.current().morph.renderOnScreen(this.mc.player, center, this.height / 2 + this.height / 6, this.height / 4, 1.0F);
=======
cell.current().morph.renderOnScreen(this.mc.thePlayer, this.width - 40, 90, 30, 1.0F);
>>>>>>>
cell.current().morph.renderOnScreen(this.mc.player, this.width - 40, 90, 30, 1.0F); |
<<<<<<<
if(ret == null) {
BufferStack bs = addrspace.read(readpos);
ret = (StreamEntry) bs.deserialize();
biglock.lock();
try {
m_cache.put(readpos, ret);
} finally {
biglock.unlock();
}
}
=======
long readpos = curpos++;
biglock.unlock();
ret = (StreamEntry) addrspace.readObject(readpos);
/*
BufferStack bs = addrspace.read(readpos);
ret = (StreamEntry) bs.deserialize();
*/
>>>>>>>
ret = (StreamEntry) addrspace.readObject(readpos);
/*
BufferStack bs = addrspace.read(readpos);
ret = (StreamEntry) bs.deserialize();
*/ |
<<<<<<<
/** Persistent storage for phase1 data in paxos */
File phase1File;
/** Persistent storage for phase2 data in paxos */
File phase2File;
=======
>>>>>>>
/** Persistent storage for phase1 data in paxos */
File phase1File;
/** Persistent storage for phase2 data in paxos */
File phase2File; |
<<<<<<<
if (mDefaultImageId != 0) {
setTransientImageResource(mDefaultImageId);
}
=======
setDefaultImageOrNull();
>>>>>>>
if (mDefaultImageId != 0) {
setTransientImageResource(mDefaultImageId);
}
<<<<<<<
public void setFadeEnabled(boolean fade) {
mFade = fade;
}
=======
private void setDefaultImageOrNull() {
if(mDefaultImageId != 0) {
setImageResource(mDefaultImageId);
}
else {
setImageBitmap(null);
}
}
>>>>>>>
public void setFadeEnabled(boolean fade) {
mFade = fade;
}
private void setDefaultImageOrNull() {
if(mDefaultImageId != 0) {
setImageResource(mDefaultImageId);
}
else {
setImageBitmap(null);
}
} |
<<<<<<<
/* Ray trace for impact */
Vec3d position = new Vec3d(this.posX, this.posY, this.posZ);
Vec3d next = new Vec3d(this.posX + this.motionX, this.posY + this.motionY, this.posZ + this.motionZ);
RayTraceResult result = this.world.rayTraceBlocks(position, next);
if (result != null)
=======
if (!this.stuck)
>>>>>>>
if (!this.stuck)
<<<<<<<
if (entity != null)
{
result = new RayTraceResult(entity);
}
/* Update position */
this.posX += this.motionX;
this.posY += this.motionY;
this.posZ += this.motionZ;
if (result != null)
{
if (result.typeOfHit == RayTraceResult.Type.BLOCK && this.world.getBlockState(result.getBlockPos()).getBlock() == Blocks.PORTAL)
=======
if (entity != null)
>>>>>>>
if (entity != null)
<<<<<<<
/* Update position, motion and rotation */
float distance = MathHelper.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.rotationYaw = (float) (MathHelper.atan2(this.motionX, this.motionZ) * (180D / Math.PI));
=======
/* Update position, motion and rotation */
float distance = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.rotationYaw = (float) (MathHelper.atan2(this.motionX, this.motionZ) * (180D / Math.PI));
>>>>>>>
/* Update position, motion and rotation */
float distance = MathHelper.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.rotationYaw = (float) (MathHelper.atan2(this.motionX, this.motionZ) * (180D / Math.PI));
<<<<<<<
this.world.spawnParticle(EnumParticleTypes.WATER_BUBBLE, this.posX - this.motionX * 0.25D, this.posY - this.motionY * 0.25D, this.posZ - this.motionZ * 0.25D, this.motionX, this.motionY, this.motionZ, new int[0]);
}
=======
for (int j = 0; j < 4; ++j)
{
this.worldObj.spawnParticle(EnumParticleTypes.WATER_BUBBLE, this.posX - this.motionX * 0.25D, this.posY - this.motionY * 0.25D, this.posZ - this.motionZ * 0.25D, this.motionX, this.motionY, this.motionZ, new int[0]);
}
>>>>>>>
for (int j = 0; j < 4; ++j)
{
this.world.spawnParticle(EnumParticleTypes.WATER_BUBBLE, this.posX - this.motionX * 0.25D, this.posY - this.motionY * 0.25D, this.posZ - this.motionZ * 0.25D, this.motionX, this.motionY, this.motionZ, new int[0]);
}
<<<<<<<
if (this.hits > this.props.hits)
{
this.move(MoverType.SELF, this.motionX, this.motionY, this.motionZ);
}
else
{
this.setPosition(this.posX, this.posY, this.posZ);
=======
if (this.hits > this.props.hits)
{
this.moveEntity(this.motionX, this.motionY, this.motionZ);
}
else
{
this.setPosition(this.posX, this.posY, this.posZ);
}
>>>>>>>
if (this.hits > this.props.hits)
{
this.move(MoverType.SELF, this.motionX, this.motionY, this.motionZ);
}
else
{
this.setPosition(this.posX, this.posY, this.posZ);
} |
<<<<<<<
if (conn.closing) {
if (conn.autoReconnect()) {
reconnect(conn);
} else {
close(key);
}
=======
} else {
if (conn.hasTLS) {
if (read > 0) {
boolean success = conn.tls.unwrapInput();
if (success) wantToWrite(conn);
}
}
>>>>>>>
} else {
if (conn.hasTLS) {
if (read > 0) {
boolean success = conn.tls.unwrapInput();
if (success) wantToWrite(conn);
}
}
dataIn.value(read);
<<<<<<<
U.must(conn.mode != SelectionKey.OP_READ);
=======
touch(conn);
>>>>>>>
U.must(conn.mode != SelectionKey.OP_READ);
touch(conn);
<<<<<<<
public void restart(RapidoidConnection conn) {
restarting.add(conn);
}
@Override
protected long getSelectorTimeout() {
return selectorTimeout;
}
=======
public SSLContext sslContext() {
return sslContext;
}
>>>>>>>
public SSLContext sslContext() {
return sslContext;
}
public void restart(RapidoidConnection conn) {
restarting.add(conn);
}
@Override
protected long getSelectorTimeout() {
return selectorTimeout;
} |
<<<<<<<
this.world.setBlockState(this.pos, this.world.getBlockState(this.pos).withProperty(AbstractBlockDirector.PLAYING, isPlaying));
=======
if (this.disableStates)
{
isPlaying = false;
}
this.worldObj.setBlockState(this.pos, this.worldObj.getBlockState(this.pos).withProperty(AbstractBlockDirector.PLAYING, isPlaying));
>>>>>>>
if (this.disableStates)
{
isPlaying = false;
}
this.world.setBlockState(this.pos, this.world.getBlockState(this.pos).withProperty(AbstractBlockDirector.PLAYING, isPlaying)); |
<<<<<<<
public class DirectByteBufferBytes extends NativeBytes {
private ByteBuffer buffer;
public DirectByteBufferBytes(int capacity) {
this(ByteBuffer.allocateDirect(capacity).order(ByteOrder.nativeOrder()), 0, capacity);
}
=======
public class DirectByteBufferBytes extends NativeBytes implements IByteBufferBytes {
private final ByteBuffer buffer;
>>>>>>>
public class DirectByteBufferBytes extends NativeBytes implements IByteBufferBytes {
private ByteBuffer buffer;
public DirectByteBufferBytes(int capacity) {
this(ByteBuffer.allocateDirect(capacity).order(ByteOrder.nativeOrder()), 0, capacity);
} |
<<<<<<<
private static final IFileParser XML_PARSER = new XmlParser();
private static final IFileParser YAML_PARSER = new YamlParser();
private static final IFileParser DEFAULT_FILE_PARSER = XML_PARSER;
=======
private static final IFileParser DEFAULT_FILE_PARSER = new SuiteXmlParser();
>>>>>>>
private static final IFileParser XML_PARSER = new SuiteXmlParser();
private static final IFileParser YAML_PARSER = new YamlParser();
private static final IFileParser DEFAULT_FILE_PARSER = XML_PARSER;
<<<<<<<
=======
private IFileParser<XmlSuite> m_fileParser;
private boolean m_loadClasses = true;
>>>>>>>
private boolean m_loadClasses = true;
<<<<<<<
XmlSuite result = getParser(currentFile).parse(currentFile, inputStream);
// System.out.println("Parsed " + currentFile + ":\n" + result.toXml());
=======
XmlSuite result = m_fileParser.parse(currentFile, inputStream, m_loadClasses);
>>>>>>>
IFileParser<XmlSuite> fileParser = getParser(currentFile);
XmlSuite result = fileParser.parse(currentFile, inputStream, m_loadClasses); |
<<<<<<<
public SeriesOmObservationCreator(Series series, AbstractObservationRequest request, LocalizedProducer<OwsServiceProvider> serviceProvider, Locale language, String pdf, Session session) {
super(request, language, serviceProvider, pdf, session);
=======
public SeriesOmObservationCreator(Series series, AbstractObservationRequest request, LocalizedProducer<OwsServiceProvider> serviceProvider, Locale language, DaoFactory daoFactory, Session session) {
super(request, language, serviceProvider, daoFactory, session);
>>>>>>>
public SeriesOmObservationCreator(Series series, AbstractObservationRequest request, LocalizedProducer<OwsServiceProvider> serviceProvider, Locale language, String pdf, DaoFactory daoFactory, Session session) {
super(request, language, serviceProvider, pdf, daoFactory, session); |
<<<<<<<
import it.niedermann.nextcloud.deck.model.ocs.comment.full.FullDeckComment;
=======
import it.niedermann.nextcloud.deck.model.widget.singlecard.SingleCardWidgetModel;
>>>>>>>
import it.niedermann.nextcloud.deck.model.widget.singlecard.SingleCardWidgetModel;
import it.niedermann.nextcloud.deck.model.ocs.comment.full.FullDeckComment;
<<<<<<<
public Long getRemoteCommentIdForLocalIdDirectly(Long localCommentId) {
return db.getCommentDao().getRemoteCommentIdForLocalIdDirectly(localCommentId);
}
public Long getLocalCommentIdForRemoteIdDirectly(long accountId, Long remoteCommentId) {
return db.getCommentDao().getLocalCommentIdForRemoteIdDirectly(accountId, remoteCommentId);
}
=======
// -------------------
// Widgets
// -------------------
public long createSingleCardWidget(int widgetId, long accountId, long boardLocalId, long cardLocalId) {
SingleCardWidgetModel model = new SingleCardWidgetModel();
model.setWidgetId(widgetId);
model.setAccountId(accountId);
model.setBoardId(boardLocalId);
model.setCardId(cardLocalId);
return db.getSingleCardWidgetModelDao().insert(model);
}
public FullSingleCardWidgetModel getFullSingleCardWidgetModel(int widgetId) {
FullSingleCardWidgetModel model = db.getSingleCardWidgetModelDao().getFullCardByRemoteIdDirectly(widgetId);
if (model != null) {
model.setFullCard(db.getCardDao().getFullCardByLocalIdDirectly(model.getAccount().getId(), model.getModel().getCardId()));
}
return model;
}
public void deleteSingleCardWidget(int widgetId) {
SingleCardWidgetModel model = new SingleCardWidgetModel();
model.setWidgetId(widgetId);
db.getSingleCardWidgetModelDao().delete(model);
}
>>>>>>>
public Long getRemoteCommentIdForLocalIdDirectly(Long localCommentId) {
return db.getCommentDao().getRemoteCommentIdForLocalIdDirectly(localCommentId);
}
public Long getLocalCommentIdForRemoteIdDirectly(long accountId, Long remoteCommentId) {
return db.getCommentDao().getLocalCommentIdForRemoteIdDirectly(accountId, remoteCommentId);
}
// -------------------
// Widgets
// -------------------
public long createSingleCardWidget(int widgetId, long accountId, long boardLocalId, long cardLocalId) {
SingleCardWidgetModel model = new SingleCardWidgetModel();
model.setWidgetId(widgetId);
model.setAccountId(accountId);
model.setBoardId(boardLocalId);
model.setCardId(cardLocalId);
return db.getSingleCardWidgetModelDao().insert(model);
}
public FullSingleCardWidgetModel getFullSingleCardWidgetModel(int widgetId) {
FullSingleCardWidgetModel model = db.getSingleCardWidgetModelDao().getFullCardByRemoteIdDirectly(widgetId);
if (model != null) {
model.setFullCard(db.getCardDao().getFullCardByLocalIdDirectly(model.getAccount().getId(), model.getModel().getCardId()));
}
return model;
}
public void deleteSingleCardWidget(int widgetId) {
SingleCardWidgetModel model = new SingleCardWidgetModel();
model.setWidgetId(widgetId);
db.getSingleCardWidgetModelDao().delete(model);
} |
<<<<<<<
import it.niedermann.nextcloud.deck.model.full.FullCard;
=======
import it.niedermann.nextcloud.deck.ui.EditActivity;
>>>>>>>
import it.niedermann.nextcloud.deck.model.full.FullCard;
import it.niedermann.nextcloud.deck.ui.EditActivity; |
<<<<<<<
=======
import it.niedermann.nextcloud.deck.DeckLog;
import it.niedermann.nextcloud.deck.api.GsonConfig;
>>>>>>>
import it.niedermann.nextcloud.deck.DeckLog;
import it.niedermann.nextcloud.deck.api.GsonConfig;
<<<<<<<
private static final String METHOD_GET = "GET";
=======
>>>>>>>
private static final String METHOD_GET = "GET"; |
<<<<<<<
import com.google.android.material.tabs.TabLayoutMediator;
=======
import com.h6ah4i.android.tablayouthelper.TabLayoutHelper;
import com.nextcloud.android.sso.exceptions.NextcloudHttpRequestFailedException;
>>>>>>>
import com.google.android.material.tabs.TabLayoutMediator;
import com.nextcloud.android.sso.exceptions.NextcloudHttpRequestFailedException;
<<<<<<<
import it.niedermann.nextcloud.deck.util.TabLayoutHelper;
=======
import it.niedermann.nextcloud.deck.util.ExceptionUtil;
>>>>>>>
import it.niedermann.nextcloud.deck.util.TabLayoutHelper;
import it.niedermann.nextcloud.deck.util.ExceptionUtil; |
<<<<<<<
new Thread(() -> {
applyUpdatesFromRemote(entity, response, accountId);
entity.setId(response.getId());
provider.updateInDB(dataBaseAdapter, accountId, entity);
callback.onResponse(entity);
}).start();
=======
response.setLocalId(newID);
if (actionOnResponse!= null) {
actionOnResponse.onResponse(entity, response);
}
provider.updateInDB(dataBaseAdapter, accountId, response);
callback.onResponse(response);
>>>>>>>
new Thread(() -> {
response.setLocalId(newID);
if (actionOnResponse!= null) {
actionOnResponse.onResponse(entity, response);
}
provider.updateInDB(dataBaseAdapter, accountId, response);
callback.onResponse(response);
}).start(); |
<<<<<<<
public void setStacks(@NonNull List<FullStack> fullStacks) {
this.stackList = fullStacks;
=======
public void setStacks(@NonNull List<FullStack> fullStacks, @NonNull Account currentAccount, long currentBoardId, boolean currentBoardHasEditPermission) {
this.stackList.clear();
this.stackList.addAll(fullStacks);
this.account = currentAccount;
this.boardId = currentBoardId;
this.canEdit = currentBoardHasEditPermission;
>>>>>>>
public void setStacks(@NonNull List<FullStack> fullStacks) {
this.stackList.clear();
this.stackList.addAll(fullStacks); |
<<<<<<<
public void createOnServer(ServerAdapter serverAdapter, DataBaseAdapter dataBaseAdapter, long accountId, IResponseCallback<Label> responder, Label entity) {
=======
public void createOnServer(ServerAdapter serverAdapter, long accountId, IResponseCallback<Label> responder, Label entity) {
entity.setBoardId(board.getId());
>>>>>>>
public void createOnServer(ServerAdapter serverAdapter, DataBaseAdapter dataBaseAdapter, long accountId, IResponseCallback<Label> responder, Label entity) {
entity.setBoardId(board.getId()); |
<<<<<<<
this.pose = custom.getPose(this.mc.player).clone();
=======
this.pose = custom.getPose(this.mc.thePlayer, 0).clone();
>>>>>>>
this.pose = custom.getPose(this.mc.player, 0).clone();
<<<<<<<
this.pose.fillInMissing(custom.getPose(this.mc.player, true));
=======
this.pose.fillInMissing(custom.getPose(this.mc.thePlayer, true, 0));
>>>>>>>
this.pose.fillInMissing(custom.getPose(this.mc.player, true, 0)); |
<<<<<<<
private static final String LOGTAG = "QREader";
private CameraSource cameraSource = null;
private BarcodeDetector barcodeDetector = null;
/**
* The constant FRONT_CAM.
*/
=======
>>>>>>>
private static final String LOGTAG = "QREader";
private CameraSource cameraSource = null;
private BarcodeDetector barcodeDetector = null;
/**
* The constant FRONT_CAM.
*/
<<<<<<<
private boolean autofocusEnabled;
=======
private static final String LOGTAG = "QREader";
>>>>>>>
private boolean autofocusEnabled;
<<<<<<<
private SurfaceHolder.Callback surfaceHolderCallback = new SurfaceHolder.Callback() {
@Override public void surfaceCreated(SurfaceHolder surfaceHolder) {
try {
if (ActivityCompat.checkSelfPermission(context, Manifest.permission.CAMERA)
!= PackageManager.PERMISSION_GRANTED) {
Log.e(LOGTAG, "Permission not granted!");
return;
} else if (!cameraRunning && cameraSource != null && surfaceView != null) {
cameraSource.start(surfaceView.getHolder());
cameraRunning = true;
}
} catch (IOException ie) {
Log.e(LOGTAG, ie.toString());
}
}
@Override public void surfaceChanged(SurfaceHolder surfaceHolder, int i, int i1, int i2) {
// do nothing
}
@Override public void surfaceDestroyed(SurfaceHolder surfaceHolder) {
stop();
}
};
/**
* Instantiates a new Qr eader.
*
* @param builder the builder
*/
public QREader(final Builder builder) {
this.autofocusEnabled = builder.autofocusEnabled;
=======
public QREader(Builder builder) {
this.autoFocusEnabled = builder.autofocus_enabled;
>>>>>>>
public QREader(Builder builder) {
this.autoFocusEnabled = builder.autofocus_enabled;
<<<<<<<
autofocusEnabled = false;
=======
autoFocusEnabled = false;
>>>>>>>
autoFocusEnabled = false;
<<<<<<<
// Setup Camera
cameraSource =
new CameraSource.Builder(context, barcodeDetector).setAutoFocusEnabled(autofocusEnabled)
.setFacing(facing)
.setRequestedPreviewSize(width, height)
.build();
=======
>>>>>>>
<<<<<<<
=======
private void startCameraView(Context context, CameraSource cameraSource,
SurfaceView surfaceView) {
if (cameraRunning)
return;
try {
if (ActivityCompat.checkSelfPermission(context, Manifest.permission.CAMERA)
!= PackageManager.PERMISSION_GRANTED) {
Log.e(LOGTAG, "Permission not granted!");
} else if (!cameraRunning && cameraSource != null && surfaceView != null) {
cameraSource.start(surfaceView.getHolder());
cameraRunning = true;
}
} catch (IOException ie) {
Log.e(LOGTAG, ie.getMessage());
ie.printStackTrace();
}
}
>>>>>>>
private void startCameraView(Context context, CameraSource cameraSource,
SurfaceView surfaceView) {
if (cameraRunning)
return;
try {
if (ActivityCompat.checkSelfPermission(context, Manifest.permission.CAMERA)
!= PackageManager.PERMISSION_GRANTED) {
Log.e(LOGTAG, "Permission not granted!");
} else if (!cameraRunning && cameraSource != null && surfaceView != null) {
cameraSource.start(surfaceView.getHolder());
cameraRunning = true;
}
} catch (IOException ie) {
Log.e(LOGTAG, ie.getMessage());
ie.printStackTrace();
}
}
<<<<<<<
/**
* Enable autofocus builder.
*
* @param autofocusEnabled the autofocus enabled
* @return the builder
*/
public Builder enableAutofocus(boolean autofocusEnabled) {
this.autofocusEnabled = autofocusEnabled;
=======
public Builder enableAutofocus(boolean autocofucEnabled) {
this.autofocus_enabled = autocofucEnabled;
>>>>>>>
/**
* Enable autofocus builder.
*
* @param autofocusEnabled the autofocus enabled
* @return the builder
*/
public Builder enableAutofocus(boolean autofocusEnabled) {
this.autofocusEnabled = autofocusEnabled; |
<<<<<<<
vendor.appendIdentifier(minData, "r");
minData.append('.');
=======
vendor.appendIdentifier(minData, "m2");
minData.append(".");
>>>>>>>
vendor.appendIdentifier(minData, "m2");
minData.append('.');
<<<<<<<
vendor.appendIdentifier(maxData, "r");
maxData.append('.');
=======
vendor.appendIdentifier(maxData, "m2");
maxData.append(".");
>>>>>>>
vendor.appendIdentifier(maxData, "m2");
maxData.append('.');
<<<<<<<
vendor.appendIdentifier(sql, MetricDatabase.METRIC_TABLE);
sql.append(' ');
=======
vendor.appendIdentifier(sql, SqlDatabase.RECORD_TABLE);
sql.append(" ");
>>>>>>>
vendor.appendIdentifier(sql, SqlDatabase.RECORD_TABLE);
sql.append(" ");
<<<<<<<
// Apply the "main" JOINs
sql.append(fromClause);
// Apply the "main" WHERE clause
sql.append(whereClause);
sql.append(" AND ");
appendSimpleWhereClause(sql, vendor, "r", MetricDatabase.METRIC_SYMBOL_FIELD, "=", database.getSymbolId(actionSymbol));
// If a dimensionId is not specified, we will append dimensionId = 00000000000000000000000000000000
if (recordMetricDimensionPredicates.isEmpty()) {
sql.append(" AND ");
appendSimpleWhereClause(sql, vendor, "r", MetricDatabase.METRIC_DIMENSION_FIELD, "=", MetricDatabase.getDimensionIdByValue(null));
}
=======
// Left joins if we're only sorting, not filtering.
if (recordMetricHavingPredicates.isEmpty()) {
sql.append(" \nLEFT OUTER JOIN ");
} else {
sql.append(" \nINNER JOIN ");
}
vendor.appendIdentifier(sql, MetricDatabase.METRIC_TABLE);
sql.append(" ");
vendor.appendIdentifier(sql, "m2");
sql.append(" ON (\n");
appendSimpleOnClause(sql, vendor, "r", SqlDatabase.ID_COLUMN, "=", "m2", MetricDatabase.METRIC_ID_FIELD);
sql.append(" AND \n");
appendSimpleWhereClause(sql, vendor, "m2", MetricDatabase.METRIC_SYMBOL_FIELD, "=", database.getSymbolId(actionSymbol));
>>>>>>>
// Left joins if we're only sorting, not filtering.
if (recordMetricHavingPredicates.isEmpty()) {
sql.append(" \nLEFT OUTER JOIN ");
} else {
sql.append(" \nINNER JOIN ");
}
vendor.appendIdentifier(sql, MetricDatabase.METRIC_TABLE);
sql.append(" ");
vendor.appendIdentifier(sql, "m2");
sql.append(" ON (\n");
appendSimpleOnClause(sql, vendor, "r", SqlDatabase.ID_COLUMN, "=", "m2", MetricDatabase.METRIC_ID_FIELD);
sql.append(" AND \n");
appendSimpleWhereClause(sql, vendor, "m2", MetricDatabase.METRIC_SYMBOL_FIELD, "=", database.getSymbolId(actionSymbol));
// If a dimensionId is not specified, we will append dimensionId = 00000000000000000000000000000000
if (recordMetricDimensionPredicates.isEmpty()) {
sql.append(" AND ");
appendSimpleWhereClause(sql, vendor, "r", MetricDatabase.METRIC_DIMENSION_FIELD, "=", MetricDatabase.getDimensionIdByValue(null));
} |
<<<<<<<
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
=======
import java.util.HashSet;
>>>>>>>
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.HashSet;
<<<<<<<
@Deprecated
public static final String JAVA_PARAMETER_TYPES_KEY = "java.parameterTypes";
@Deprecated
public void setJavaParameterTypeNames(List<String> ignored) {
}
=======
>>>>>>>
@Deprecated
public static final String JAVA_PARAMETER_TYPES_KEY = "java.parameterTypes";
@Deprecated
public void setJavaParameterTypeNames(List<String> ignored) {
} |
<<<<<<<
putInMap(id, dimensionId, eventDate, metricAccess, amount);
=======
double waitSeconds = new BigDecimal(withinSeconds * .75d).setScale(2).doubleValue();
double executeSeconds = new BigDecimal(withinSeconds * .25d).setScale(2).doubleValue();
putInMap(metricDatabase, dimensionId, amount, waitSeconds);
>>>>>>>
double waitSeconds = new BigDecimal(withinSeconds * .75d).setScale(2).doubleValue();
double executeSeconds = new BigDecimal(withinSeconds * .25d).setScale(2).doubleValue();
putInMap(id, dimensionId, eventDate, metricAccess, amount, waitSeconds);
<<<<<<<
private static void putInMap(UUID id, UUID dimensionId, DateTime eventDate, MetricAccess metricAccess, double amount) {
=======
private static void putInMap(MetricDatabase metricDatabase, UUID dimensionId, double amount, double waitSeconds) {
ConcurrentHashMap<String,QueuedMetricIncrement> queue = queuedIncrements.get(waitSeconds);
if (queue == null) {
queuedIncrements.putIfAbsent(waitSeconds, new ConcurrentHashMap<String, QueuedMetricIncrement>());
queue = queuedIncrements.get(waitSeconds);
}
>>>>>>>
private static void putInMap(UUID id, UUID dimensionId, DateTime eventDate, MetricAccess metricAccess, double amount, double waitSeconds) {
ConcurrentHashMap<String,QueuedMetricIncrement> queue = queuedIncrements.get(waitSeconds);
if (queue == null) {
queuedIncrements.putIfAbsent(waitSeconds, new ConcurrentHashMap<String, QueuedMetricIncrement>());
queue = queuedIncrements.get(waitSeconds);
}
<<<<<<<
QueuedMetricIncrement current = queuedIncrements.putIfAbsent(key, placeholder);
if (current == null) {
current = placeholder;
}
QueuedMetricIncrement next = new QueuedMetricIncrement(id, dimensionId, eventDate, metricAccess, current.amount + amount);
if (queuedIncrements.replace(key, current, next)) {
=======
QueuedMetricIncrement current = queue.putIfAbsent(key, placeholder);
if (current == null) current = placeholder;
QueuedMetricIncrement next = new QueuedMetricIncrement(metricDatabase, dimensionId, current.amount + amount);
if (queue.replace(key, current, next)) {
>>>>>>>
QueuedMetricIncrement current = queue.putIfAbsent(key, placeholder);
if (current == null) {
current = placeholder;
}
QueuedMetricIncrement next = new QueuedMetricIncrement(id, dimensionId, eventDate, metricAccess, current.amount + amount);
if (queue.replace(key, current, next)) {
<<<<<<<
private final transient ConcurrentHashMap<String, QueuedMetricIncrement> queuedIncrements;
=======
private transient final ConcurrentHashMap<String, QueuedMetricIncrement> queuedIncrements;
>>>>>>>
private transient final ConcurrentHashMap<String, QueuedMetricIncrement> queuedIncrements;
<<<<<<<
=======
//LOGGER.info("Incrementing : " + queuedIncrement.metricDatabase.toKeyString() + " : " + queuedIncrement.dimensionId + " += " + queuedIncrement.amount );
>>>>>>>
//LOGGER.info("Incrementing : " + queuedIncrement.metricAccess.getSymbolId() + " / " + queuedIncrement.id + " : " + queuedIncrement.dimensionId + " += " + queuedIncrement.amount );
<<<<<<<
throw new DatabaseException(queuedIncrement.metricAccess.getDatabase(), "SQLException during MetricAccess.incrementMetricByDimensionId", ex);
=======
// TODO: log this somewhere so it can be recovered if the database fails catastrophically
throw new DatabaseException(queuedIncrement.metricDatabase.getDatabase(), "SQLException during MetricDatabase.incrementMetricByDimensionId", ex);
>>>>>>>
// TODO: log this somewhere so it can be recovered if the database fails catastrophically
throw new DatabaseException(queuedIncrement.metricAccess.getDatabase(), "SQLException during MetricAccess.incrementMetricByDimensionId", ex); |
<<<<<<<
tableName = sqlIndexTable.getName(database, index);
=======
tableName = MetricAccess.Static.getMetricTableIdentifier(database); // Don't wrap this with appendIdentifier
table = tableName; // XXX This line is safe to remove when feature/schema12 is merged in.
>>>>>>>
tableName = MetricAccess.Static.getMetricTableIdentifier(database); // Don't wrap this with appendIdentifier |
<<<<<<<
BlockPos pos = null;
ItemStack left = Minecraft.getMinecraft().player.getHeldItemMainhand();
=======
ItemStack right = Minecraft.getMinecraft().thePlayer.getHeldItemMainhand();
>>>>>>>
ItemStack right = Minecraft.getMinecraft().player.getHeldItemMainhand(); |
<<<<<<<
import com.psddev.dari.db.ComparisonPredicate;
import com.psddev.dari.db.DatabaseException;
=======
>>>>>>>
import com.psddev.dari.db.ComparisonPredicate; |
<<<<<<<
public Set<String> getColumns(Connection connection, String table) throws SQLException {
Set<String> columnNames = new HashSet<String>();
String catalog = connection.getCatalog();
DatabaseMetaData meta = connection.getMetaData();
ResultSet result = null;
try {
result = meta.getColumns(catalog, null, table, null);
while (result.next()) {
String columnName = result.getString("COLUMN_NAME");
if (columnName != null) {
columnNames.add(columnName);
}
}
} finally {
if (result != null) {
result.close();
}
}
return columnNames;
}
=======
public boolean checkTableExists(String tableIdentifier) {
Connection connection = database.openConnection();
boolean tableExists = false;
try {
Statement statement = connection.createStatement();
try {
ResultSet result = statement.executeQuery("SELECT 'x' FROM " + tableIdentifier + " WHERE 0 = 1");
try {
tableExists = true;
} finally {
result.close();
}
} finally {
statement.close();
}
} catch (SQLException error) {
if ("42S02".equals(error.getSQLState())) {
tableExists = false;
}
} finally {
database.closeConnection(connection);
}
return tableExists;
}
>>>>>>>
public Set<String> getColumns(Connection connection, String table) throws SQLException {
Set<String> columnNames = new HashSet<String>();
String catalog = connection.getCatalog();
DatabaseMetaData meta = connection.getMetaData();
ResultSet result = null;
try {
result = meta.getColumns(catalog, null, table, null);
while (result.next()) {
String columnName = result.getString("COLUMN_NAME");
if (columnName != null) {
columnNames.add(columnName);
}
}
} finally {
if (result != null) {
result.close();
}
}
return columnNames;
}
public boolean checkTableExists(String tableIdentifier) {
Connection connection = database.openConnection();
boolean tableExists = false;
try {
Statement statement = connection.createStatement();
try {
ResultSet result = statement.executeQuery("SELECT 'x' FROM " + tableIdentifier + " WHERE 0 = 1");
try {
tableExists = true;
} finally {
result.close();
}
} finally {
statement.close();
}
} catch (SQLException error) {
if ("42S02".equals(error.getSQLState())) {
tableExists = false;
}
} finally {
database.closeConnection(connection);
}
return tableExists;
} |
<<<<<<<
=======
private WheelView.DividerType dividerType;//分隔线类型
>>>>>>>
private WheelView.DividerType dividerType;//分隔线类型
<<<<<<<
/*wheelOptions.setPicker(optionsItems, options2Items, options3Items, linkage);*/
=======
tvTitle.setText(Str_Title);
>>>>>>>
tvTitle.setText(Str_Title); |
<<<<<<<
.setType(new boolean[]{true, true, true, false, false, false})
.setLabel("", "", "", "", "", "")
=======
.setType(new boolean[]{false, true, true, false, false, false})
.setLabel("", "", "", "点", "分", "")
>>>>>>>
.setType(new boolean[]{true, true, true, false, false, false})
.setLabel("", "", "", "", "", "")
<<<<<<<
=======
private String getTime(Date date) {//可根据需要自行截取数据显示
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
return format.format(date);
}
private void initOptionData() {
/**
* 注意：如果是添加JavaBean实体数据，则实体类需要实现 IPickerViewData 接口，
* PickerView会通过getPickerViewText方法获取字符串显示出来。
*/
getCardData();
getNoLinkData();
//选项1
options1Items.add(new ProvinceBean(0, "广东", "描述部分", "其他数据"));
options1Items.add(new ProvinceBean(1, "湖南", "描述部分", "其他数据"));
options1Items.add(new ProvinceBean(2, "广西", "描述部分", "其他数据"));
//选项2
ArrayList<String> options2Items_01 = new ArrayList<>();
options2Items_01.add("广州");
options2Items_01.add("佛山");
options2Items_01.add("东莞");
options2Items_01.add("珠海");
ArrayList<String> options2Items_02 = new ArrayList<>();
options2Items_02.add("长沙");
options2Items_02.add("岳阳");
options2Items_02.add("株洲");
options2Items_02.add("衡阳");
ArrayList<String> options2Items_03 = new ArrayList<>();
options2Items_03.add("桂林");
options2Items_03.add("玉林");
options2Items.add(options2Items_01);
options2Items.add(options2Items_02);
options2Items.add(options2Items_03);
/*--------数据源添加完毕---------*/
}
>>>>>>>
private String getTime(Date date) {//可根据需要自行截取数据显示
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
return format.format(date);
}
private void initOptionData() {
/**
* 注意：如果是添加JavaBean实体数据，则实体类需要实现 IPickerViewData 接口，
* PickerView会通过getPickerViewText方法获取字符串显示出来。
*/
getCardData();
getNoLinkData();
//选项1
options1Items.add(new ProvinceBean(0, "广东", "描述部分", "其他数据"));
options1Items.add(new ProvinceBean(1, "湖南", "描述部分", "其他数据"));
options1Items.add(new ProvinceBean(2, "广西", "描述部分", "其他数据"));
//选项2
ArrayList<String> options2Items_01 = new ArrayList<>();
options2Items_01.add("广州");
options2Items_01.add("佛山");
options2Items_01.add("东莞");
options2Items_01.add("珠海");
ArrayList<String> options2Items_02 = new ArrayList<>();
options2Items_02.add("长沙");
options2Items_02.add("岳阳");
options2Items_02.add("株洲");
options2Items_02.add("衡阳");
ArrayList<String> options2Items_03 = new ArrayList<>();
options2Items_03.add("桂林");
options2Items_03.add("玉林");
options2Items.add(options2Items_01);
options2Items.add(options2Items_02);
options2Items.add(options2Items_03);
/*--------数据源添加完毕---------*/
} |
<<<<<<<
import org.apache.cloudstack.api.response.ExtractResponse;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
=======
>>>>>>>
import org.apache.cloudstack.api.response.ExtractResponse;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
<<<<<<<
=======
boolean listAll = false;
if (isoFilter != null && isoFilter == TemplateFilter.all) {
if (caller.getType() == Account.ACCOUNT_TYPE_NORMAL) {
throw new InvalidParameterValueException("Filter " + TemplateFilter.all + " can be specified by admin only");
}
listAll = true;
}
List<Long> permittedAccountIds = new ArrayList<Long>();
Ternary<Long, Boolean, ListProjectResourcesCriteria> domainIdRecursiveListProject = new Ternary<Long, Boolean, ListProjectResourcesCriteria>(
cmd.getDomainId(), cmd.isRecursive(), null);
_accountMgr.buildACLSearchParameters(caller, cmd.getId(), cmd.getAccountName(), cmd.getProjectId(), permittedAccountIds,
domainIdRecursiveListProject, listAll, false);
ListProjectResourcesCriteria listProjectResourcesCriteria = domainIdRecursiveListProject.third();
List<Account> permittedAccounts = new ArrayList<Account>();
for (Long accountId : permittedAccountIds) {
permittedAccounts.add(_accountMgr.getAccount(accountId));
}
HypervisorType hypervisorType = HypervisorType.getType(cmd.getHypervisor());
return listTemplates(cmd.getId(), cmd.getIsoName(), cmd.getKeyword(), isoFilter, true, cmd.isBootable(), cmd.getPageSizeVal(),
cmd.getStartIndex(), cmd.getZoneId(), hypervisorType, true, cmd.listInReadyState(), permittedAccounts, caller,
listProjectResourcesCriteria, tags, cmd.getZoneType());
}
@Override
public Set<Pair<Long, Long>> listTemplates(ListTemplatesCmd cmd) throws IllegalArgumentException, InvalidParameterValueException {
TemplateFilter templateFilter = TemplateFilter.valueOf(cmd.getTemplateFilter());
Long id = cmd.getId();
Map<String, String> tags = cmd.getTags();
Account caller = UserContext.current().getCaller();
boolean listAll = false;
if (templateFilter != null && templateFilter == TemplateFilter.all) {
if (caller.getType() == Account.ACCOUNT_TYPE_NORMAL) {
throw new InvalidParameterValueException("Filter " + TemplateFilter.all + " can be specified by admin only");
}
listAll = true;
}
List<Long> permittedAccountIds = new ArrayList<Long>();
Ternary<Long, Boolean, ListProjectResourcesCriteria> domainIdRecursiveListProject = new Ternary<Long, Boolean, ListProjectResourcesCriteria>(
cmd.getDomainId(), cmd.isRecursive(), null);
_accountMgr.buildACLSearchParameters(caller, id, cmd.getAccountName(), cmd.getProjectId(), permittedAccountIds, domainIdRecursiveListProject,
listAll, false);
ListProjectResourcesCriteria listProjectResourcesCriteria = domainIdRecursiveListProject.third();
List<Account> permittedAccounts = new ArrayList<Account>();
for (Long accountId : permittedAccountIds) {
permittedAccounts.add(_accountMgr.getAccount(accountId));
}
boolean showDomr = ((templateFilter != TemplateFilter.selfexecutable) && (templateFilter != TemplateFilter.featured));
HypervisorType hypervisorType = HypervisorType.getType(cmd.getHypervisor());
return listTemplates(id, cmd.getTemplateName(), cmd.getKeyword(), templateFilter, false, null, cmd.getPageSizeVal(), cmd.getStartIndex(),
cmd.getZoneId(), hypervisorType, showDomr, cmd.listInReadyState(), permittedAccounts, caller, listProjectResourcesCriteria, tags, cmd.getZoneType());
}
>>>>>>>
<<<<<<<
cmdList.add(AddImageStoreCmd.class);
cmdList.add(ListImageStoresCmd.class);
cmdList.add(DeleteImageStoreCmd.class);
cmdList.add(CreateCacheStoreCmd.class);
=======
cmdList.add(CreateAffinityGroupCmd.class);
cmdList.add(DeleteAffinityGroupCmd.class);
cmdList.add(ListAffinityGroupsCmd.class);
cmdList.add(UpdateVMAffinityGroupCmd.class);
cmdList.add(ListAffinityGroupTypesCmd.class);
cmdList.add(ListNetworkIsolationMethodsCmd.class);
>>>>>>>
cmdList.add(AddImageStoreCmd.class);
cmdList.add(ListImageStoresCmd.class);
cmdList.add(DeleteImageStoreCmd.class);
cmdList.add(CreateCacheStoreCmd.class);
cmdList.add(CreateAffinityGroupCmd.class);
cmdList.add(DeleteAffinityGroupCmd.class);
cmdList.add(ListAffinityGroupsCmd.class);
cmdList.add(UpdateVMAffinityGroupCmd.class);
cmdList.add(ListAffinityGroupTypesCmd.class);
cmdList.add(ListNetworkIsolationMethodsCmd.class); |
<<<<<<<
String controlIp = null;
=======
boolean forceStop = false;
>>>>>>>
String controlIp = null;
boolean forceStop = false;
<<<<<<<
public String getControlIp(){
return controlIp;
}
public void setControlIp(String controlIp){
this.controlIp =controlIp;
}
=======
public boolean isForceStop() {
return forceStop;
}
>>>>>>>
public String getControlIp(){
return controlIp;
}
public void setControlIp(String controlIp){
this.controlIp = controlIp;
}
public boolean isForceStop() {
return forceStop;
} |
<<<<<<<
if (this.checkName(name, "ajs", "net.minecraft.world.World"))
=======
if (checkName(name, "aid", "net.minecraft.world.World"))
>>>>>>>
if (checkName(name, "ajs", "net.minecraft.world.World"))
<<<<<<<
else if (this.checkName(name, "bqm", "net.minecraft.client.renderer.RenderGlobal"))
=======
else if (checkName(name, "boh", "net.minecraft.client.renderer.RenderGlobal"))
>>>>>>>
else if (checkName(name, "bqm", "net.minecraft.client.renderer.RenderGlobal"))
<<<<<<<
else if (this.checkName(name, "bqc", "net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer"))
=======
else if (checkName(name, "bnx", "net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer"))
>>>>>>>
else if (checkName(name, "bqc", "net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer"))
<<<<<<<
else if (this.checkName(name, "cae", "net.minecraft.client.resources.SimpleReloadableResourceManager"))
{
System.out.println("BBCoreMod: Transforming SimpleReloadableResourceManager class (" + name + ")");
return this.resourcePack.transform(name, basicClass);
}
=======
>>>>>>> |
<<<<<<<
=======
import net.minecraft.client.renderer.VertexBuffer;
import net.minecraft.client.renderer.texture.ITextureObject;
import net.minecraft.client.renderer.texture.SimpleTexture;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.client.renderer.texture.TextureUtil;
>>>>>>>
import net.minecraft.client.renderer.texture.ITextureObject;
import net.minecraft.client.renderer.texture.SimpleTexture;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.client.renderer.texture.TextureUtil; |
<<<<<<<
import org.apache.log4j.Logger;
import org.apache.cloudstack.acl.AclEntityType;
=======
>>>>>>>
import org.apache.log4j.Logger;
import org.apache.cloudstack.acl.AclEntityType;
<<<<<<<
@APICommand(name = "deployVirtualMachine", description = "Creates and automatically starts a virtual machine based on a service offering, disk offering, and template.", responseObject = UserVmResponse.class, responseView = ResponseView.Restricted, entityType = { AclEntityType.VirtualMachine })
public class DeployVMCmd extends BaseAsyncCreateCmd {
=======
@APICommand(name = "deployVirtualMachine", description = "Creates and automatically starts a virtual machine based on a service offering, disk offering, and template.", responseObject = UserVmResponse.class)
public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd {
>>>>>>>
@APICommand(name = "deployVirtualMachine", description = "Creates and automatically starts a virtual machine based on a service offering, disk offering, and template.", responseObject = UserVmResponse.class, responseView = ResponseView.Restricted, entityType = { AclEntityType.VirtualMachine })
public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd { |
<<<<<<<
private boolean displayNetwork;
=======
private Long networkAclId;
>>>>>>>
private boolean displayNetwork;
private Long networkAclId;
<<<<<<<
this.displayNetwork = network.getDisplayNetwork();
=======
this.networkAclId = network.getNetworkACLId();
>>>>>>>
this.displayNetwork = network.getDisplayNetwork();
this.networkAclId = network.getNetworkACLId(); |
<<<<<<<
List<RoleVO> findByName(String roleName);
RoleVO findByNameAndType(String roleName, RoleType type);
=======
Pair<List<RoleVO>, Integer> findAllByRoleType(RoleType type, Long offset, Long limit);
>>>>>>>
List<RoleVO> findByName(String roleName);
RoleVO findByNameAndType(String roleName, RoleType type);
Pair<List<RoleVO>, Integer> findAllByRoleType(RoleType type, Long offset, Long limit); |
<<<<<<<
import java.util.Date;
import java.util.List;
import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd;
import org.apache.cloudstack.api.command.user.iso.RegisterIsoCmd;
import org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
=======
>>>>>>>
import java.util.Date;
import java.util.List;
import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd;
import org.apache.cloudstack.api.command.user.iso.RegisterIsoCmd;
import org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component; |
<<<<<<<
import com.cloud.network.Network.GuestType;
=======
import com.cloud.network.Network.Provider;
>>>>>>>
import com.cloud.network.Network.GuestType;
import com.cloud.network.Network.Provider; |
<<<<<<<
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.cloudstack.api.command.user.template.CreateTemplateCmd;
import org.apache.cloudstack.api.command.user.vm.*;
import org.apache.cloudstack.api.command.user.vmgroup.CreateVMGroupCmd;
import org.apache.cloudstack.api.command.user.vmgroup.DeleteVMGroupCmd;
import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd;
import org.apache.cloudstack.api.command.user.volume.DetachVolumeCmd;
import org.apache.commons.codec.binary.Base64;
import org.apache.log4j.Logger;
=======
>>>>>>>
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.cloudstack.api.command.user.template.CreateTemplateCmd;
import org.apache.cloudstack.api.command.user.vm.*;
import org.apache.cloudstack.api.command.user.vmgroup.CreateVMGroupCmd;
import org.apache.cloudstack.api.command.user.vmgroup.DeleteVMGroupCmd;
import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd;
import org.apache.cloudstack.api.command.user.volume.DetachVolumeCmd;
import org.apache.commons.codec.binary.Base64;
import org.apache.log4j.Logger;
<<<<<<<
import com.cloud.api.query.dao.UserVmJoinDao;
import com.cloud.api.query.vo.UserVmJoinVO;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.command.admin.vm.AssignVMCmd;
import org.apache.cloudstack.api.command.user.vm.DeployVMCmd;
import org.apache.cloudstack.api.command.user.vm.DestroyVMCmd;
import org.apache.cloudstack.api.command.user.vm.ListVMsCmd;
import org.apache.cloudstack.api.command.user.vm.RebootVMCmd;
import org.apache.cloudstack.api.command.admin.vm.RecoverVMCmd;
import org.apache.cloudstack.api.command.user.vm.ResetVMPasswordCmd;
import org.apache.cloudstack.api.command.user.vm.RestoreVMCmd;
import org.apache.cloudstack.api.command.user.vm.UpdateVMCmd;
import org.apache.cloudstack.api.command.user.vm.UpgradeVMCmd;
=======
import com.cloud.api.BaseCmd;
import com.cloud.api.commands.*;
>>>>>>>
import com.cloud.api.query.dao.UserVmJoinDao;
import com.cloud.api.query.vo.UserVmJoinVO;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.command.admin.vm.AssignVMCmd;
import org.apache.cloudstack.api.command.user.vm.DeployVMCmd;
import org.apache.cloudstack.api.command.user.vm.DestroyVMCmd;
import org.apache.cloudstack.api.command.user.vm.ListVMsCmd;
import org.apache.cloudstack.api.command.user.vm.RebootVMCmd;
import org.apache.cloudstack.api.command.admin.vm.RecoverVMCmd;
import org.apache.cloudstack.api.command.user.vm.ResetVMPasswordCmd;
import org.apache.cloudstack.api.command.user.vm.RestoreVMCmd;
import org.apache.cloudstack.api.command.user.vm.UpdateVMCmd;
import org.apache.cloudstack.api.command.user.vm.UpgradeVMCmd;
<<<<<<<
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Filter;
import com.cloud.utils.db.GlobalLock;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.SearchCriteria.Func;
=======
import com.cloud.utils.db.*;
>>>>>>>
import com.cloud.utils.db.DB;
import com.cloud.utils.db.Filter;
import com.cloud.utils.db.GlobalLock;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.SearchCriteria.Func;
<<<<<<<
s_logger.debug("Creating network for account " + newAccount + " from the network offering id=" +
=======
s_logger.debug("Creating network for account " + newAccount + " from the network offering id=" +
>>>>>>>
s_logger.debug("Creating network for account " + newAccount + " from the network offering id=" + |
<<<<<<<
import java.sql.Connection;
import java.sql.SQLException;
=======
import java.util.ArrayList;
>>>>>>>
import java.util.ArrayList;
<<<<<<<
import com.cloud.utils.component.Inject;
import com.cloud.utils.db.ConnectionConcierge;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GlobalLock;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.exception.CloudRuntimeException;
=======
import com.cloud.utils.db.DB;
import com.cloud.utils.time.InaccurateClock;
>>>>>>>
import com.cloud.utils.component.Inject;
import com.cloud.utils.db.ConnectionConcierge;
import com.cloud.utils.db.DB;
import com.cloud.utils.time.InaccurateClock;
<<<<<<<
private AlertManager _alertMgr;
private long _msId;
private ConnectionConcierge _concierge;
@Inject
ClusterDao _clusterDao;
protected AgentMonitor() {
}
public AgentMonitor(long msId, HostDao hostDao, VMInstanceDao vmDao, DataCenterDao dcDao, HostPodDao podDao, AgentManagerImpl agentMgr, AlertManager alertMgr, long pingTimeout) {
super("AgentMonitor");
_msId = msId;
=======
private AlertManager _alertMgr;
private long _msId;
// private ConnectionConcierge _concierge;
private Map<Long, Long> _pingMap;
protected AgentMonitor() {
}
public AgentMonitor(long msId, HostDao hostDao, VMInstanceDao vmDao, DataCenterDao dcDao, HostPodDao podDao, AgentManagerImpl agentMgr, AlertManager alertMgr, long pingTimeout) {
super("AgentMonitor");
_msId = msId;
>>>>>>>
private AlertManager _alertMgr;
private long _msId;
private ConnectionConcierge _concierge;
@Inject
ClusterDao _clusterDao;
// private ConnectionConcierge _concierge;
private Map<Long, Long> _pingMap;
protected AgentMonitor() {
}
public AgentMonitor(long msId, HostDao hostDao, VMInstanceDao vmDao, DataCenterDao dcDao, HostPodDao podDao, AgentManagerImpl agentMgr, AlertManager alertMgr, long pingTimeout) {
super("AgentMonitor");
_msId = msId;
<<<<<<<
} finally {
lock.unlock();
=======
>>>>>>>
<<<<<<<
Transaction txn = Transaction.currentTxn();
txn.transitToUserManagedConnection(_concierge.conn());
try {
HostVO host = _hostDao.findById(agentId);
if( host == null ) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("Cant not find host " + agentId);
}
} else {
_hostDao.updateStatus(host, Event.Ping, _msId);
}
processed = true;
} finally {
txn.transitToAutoManagedConnection(Transaction.CLOUD_DB);
}
=======
pingBy(agentId);
>>>>>>>
pingBy(agentId);
<<<<<<<
=======
protected List<Long> findAgentsBehindOnPing() {
List<Long> agentsBehind = new ArrayList<Long>();
long cutoffTime = InaccurateClock.getTimeInSeconds() - _pingTimeout;
for (Map.Entry<Long, Long> entry : _pingMap.entrySet()) {
if (entry.getValue() < cutoffTime) {
agentsBehind.add(entry.getKey());
}
}
if (agentsBehind.size() > 0) {
s_logger.info("Found the following agents behind on ping: " + agentsBehind);
}
return agentsBehind;
}
/**
* @deprecated We're using the in-memory
*/
@Deprecated
protected List<HostVO> findHostsBehindOnPing() {
long time = (System.currentTimeMillis() >> 10) - _pingTimeout;
List<HostVO> hosts = _hostDao.findLostHosts(time);
if (s_logger.isInfoEnabled()) {
s_logger.info("Found " + hosts.size() + " hosts behind on ping. pingTimeout : " + _pingTimeout +
", mark time : " + time);
}
for (HostVO host : hosts) {
if (host.getType().equals(Host.Type.ExternalFirewall) ||
host.getType().equals(Host.Type.ExternalLoadBalancer) ||
host.getType().equals(Host.Type.TrafficMonitor) ||
host.getType().equals(Host.Type.SecondaryStorage)) {
continue;
}
if (host.getManagementServerId() == null || host.getManagementServerId() == _msId) {
if (s_logger.isInfoEnabled()) {
s_logger.info("Asking agent mgr to investgate why host " + host.getId() +
" is behind on ping. last ping time: " + host.getLastPinged());
}
_agentMgr.disconnect(host.getId(), Event.PingTimeout, true);
}
}
return hosts;
}
>>>>>>>
protected List<Long> findAgentsBehindOnPing() {
List<Long> agentsBehind = new ArrayList<Long>();
long cutoffTime = InaccurateClock.getTimeInSeconds() - _pingTimeout;
for (Map.Entry<Long, Long> entry : _pingMap.entrySet()) {
if (entry.getValue() < cutoffTime) {
agentsBehind.add(entry.getKey());
}
}
if (agentsBehind.size() > 0) {
s_logger.info("Found the following agents behind on ping: " + agentsBehind);
}
return agentsBehind;
}
/**
* @deprecated We're using the in-memory
*/
@Deprecated
protected List<HostVO> findHostsBehindOnPing() {
long time = (System.currentTimeMillis() >> 10) - _pingTimeout;
List<HostVO> hosts = _hostDao.findLostHosts(time);
if (s_logger.isInfoEnabled()) {
s_logger.info("Found " + hosts.size() + " hosts behind on ping. pingTimeout : " + _pingTimeout +
", mark time : " + time);
}
for (HostVO host : hosts) {
if (host.getType().equals(Host.Type.ExternalFirewall) ||
host.getType().equals(Host.Type.ExternalLoadBalancer) ||
host.getType().equals(Host.Type.TrafficMonitor) ||
host.getType().equals(Host.Type.SecondaryStorage)) {
continue;
}
if (host.getManagementServerId() == null || host.getManagementServerId() == _msId) {
if (s_logger.isInfoEnabled()) {
s_logger.info("Asking agent mgr to investgate why host " + host.getId() +
" is behind on ping. last ping time: " + host.getLastPinged());
}
_agentMgr.disconnect(host.getId(), Event.PingTimeout, true);
}
}
return hosts;
}
<<<<<<<
public void processConnect(HostVO host, StartupCommand cmd, boolean forRebalance) {
=======
public void processConnect(HostVO host, StartupCommand cmd, boolean forRebalance) {
if (host.getType().equals(Host.Type.ExternalFirewall) ||
host.getType().equals(Host.Type.ExternalLoadBalancer) ||
host.getType().equals(Host.Type.TrafficMonitor) ||
host.getType().equals(Host.Type.SecondaryStorage)) {
return;
}
// NOTE: We don't use pingBy here because we're initiating.
_pingMap.put(host.getId(), InaccurateClock.getTimeInSeconds());
>>>>>>>
public void processConnect(HostVO host, StartupCommand cmd, boolean forRebalance) {
if (host.getType().equals(Host.Type.ExternalFirewall) ||
host.getType().equals(Host.Type.ExternalLoadBalancer) ||
host.getType().equals(Host.Type.TrafficMonitor) ||
host.getType().equals(Host.Type.SecondaryStorage)) {
return;
}
// NOTE: We don't use pingBy here because we're initiating.
_pingMap.put(host.getId(), InaccurateClock.getTimeInSeconds()); |
<<<<<<<
=======
import com.cloud.network.Network.State;
import com.cloud.network.Network.Event;
import com.cloud.network.NetworkAccountDaoImpl;
import com.cloud.network.NetworkAccountVO;
import com.cloud.network.NetworkDomainVO;
import com.cloud.network.NetworkServiceMapVO;
import com.cloud.network.NetworkVO;
>>>>>>>
import com.cloud.network.Network.State;
import com.cloud.network.Network.Event;
<<<<<<<
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.GenericSearchBuilder;
import com.cloud.utils.db.JoinBuilder;
=======
import com.cloud.utils.component.ComponentLocator;
import com.cloud.utils.db.*;
>>>>>>>
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.GenericSearchBuilder;
import com.cloud.utils.db.JoinBuilder;
import com.cloud.utils.db.*;
<<<<<<<
@Component
=======
import javax.ejb.Local;
import javax.persistence.TableGenerator;
import java.util.List;
import java.util.Map;
import java.util.Random;
>>>>>>>
@Component
<<<<<<<
=======
>>>>>>> |
<<<<<<<
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.utils.db.GenericDao;
import com.google.gson.annotations.Expose;
import javax.persistence.*;
import org.apache.cloudstack.acl.AclEntityType;
=======
>>>>>>> |
<<<<<<<
import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.StoragePoolForMigrationResponse;
=======
>>>>>>>
import org.apache.cloudstack.api.response.TemplateResponse;
<<<<<<<
import com.cloud.api.ApiDBUtils;
import com.cloud.api.query.vo.AccountJoinVO;
import com.cloud.api.query.vo.AffinityGroupJoinVO;
import com.cloud.api.query.vo.AsyncJobJoinVO;
import com.cloud.api.query.vo.DataCenterJoinVO;
import com.cloud.api.query.vo.DiskOfferingJoinVO;
import com.cloud.api.query.vo.DomainRouterJoinVO;
import com.cloud.api.query.vo.EventJoinVO;
import com.cloud.api.query.vo.HostJoinVO;
import com.cloud.api.query.vo.ImageStoreJoinVO;
import com.cloud.api.query.vo.InstanceGroupJoinVO;
import com.cloud.api.query.vo.ProjectAccountJoinVO;
import com.cloud.api.query.vo.ProjectInvitationJoinVO;
import com.cloud.api.query.vo.ProjectJoinVO;
import com.cloud.api.query.vo.ResourceTagJoinVO;
import com.cloud.api.query.vo.SecurityGroupJoinVO;
import com.cloud.api.query.vo.ServiceOfferingJoinVO;
import com.cloud.api.query.vo.StoragePoolJoinVO;
import com.cloud.api.query.vo.TemplateJoinVO;
import com.cloud.api.query.vo.UserAccountJoinVO;
import com.cloud.api.query.vo.UserVmJoinVO;
import com.cloud.api.query.vo.VolumeJoinVO;
import com.cloud.user.Account;
import com.cloud.user.UserContext;
=======
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.Hashtable;
import java.util.List;
>>>>>>>
import com.cloud.api.query.vo.ImageStoreJoinVO;
import com.cloud.api.query.vo.TemplateJoinVO;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.Hashtable;
import java.util.List;
<<<<<<<
public static List<ImageStoreResponse> createImageStoreResponse(ImageStoreJoinVO... stores) {
Hashtable<Long, ImageStoreResponse> vrDataList = new Hashtable<Long, ImageStoreResponse>();
// Initialise the vrdatalist with the input data
for (ImageStoreJoinVO vr : stores) {
ImageStoreResponse vrData = vrDataList.get(vr.getId());
if ( vrData == null ){
// first time encountering this vm
vrData = ApiDBUtils.newImageStoreResponse(vr);
}
else{
// update tags
vrData = ApiDBUtils.fillImageStoreDetails(vrData, vr);
}
vrDataList.put(vr.getId(), vrData);
}
return new ArrayList<ImageStoreResponse>(vrDataList.values());
}
public static List<StoragePoolForMigrationResponse> createStoragePoolForMigrationResponse(StoragePoolJoinVO... pools) {
Hashtable<Long, StoragePoolForMigrationResponse> vrDataList = new Hashtable<Long, StoragePoolForMigrationResponse>();
=======
public static List<StoragePoolResponse> createStoragePoolForMigrationResponse(StoragePoolJoinVO... pools) {
Hashtable<Long, StoragePoolResponse> vrDataList = new Hashtable<Long, StoragePoolResponse>();
>>>>>>>
public static List<ImageStoreResponse> createImageStoreResponse(ImageStoreJoinVO... stores) {
Hashtable<Long, ImageStoreResponse> vrDataList = new Hashtable<Long, ImageStoreResponse>();
// Initialise the vrdatalist with the input data
for (ImageStoreJoinVO vr : stores) {
ImageStoreResponse vrData = vrDataList.get(vr.getId());
if ( vrData == null ){
// first time encountering this vm
vrData = ApiDBUtils.newImageStoreResponse(vr);
}
else{
// update tags
vrData = ApiDBUtils.fillImageStoreDetails(vrData, vr);
}
vrDataList.put(vr.getId(), vrData);
}
return new ArrayList<ImageStoreResponse>(vrDataList.values());
}
public static List<StoragePoolResponse> createStoragePoolForMigrationResponse(StoragePoolJoinVO... pools) {
Hashtable<Long, StoragePoolResponse> vrDataList = new Hashtable<Long, StoragePoolResponse>(); |
<<<<<<<
=======
import com.cloud.agent.api.to.DataObjectType;
import com.cloud.exception.AgentUnavailableException;
>>>>>>>
import com.cloud.agent.api.to.DataObjectType; |
<<<<<<<
public static final String S2S_VPN_GATEWAY_ID = "s2svpngatewayid";
public static final String S2S_CUSTOMER_GATEWAY_ID = "s2scustomergatewayid";
public static final String IPSEC_PSK = "ipsecpsk";
public static final String GUEST_IP = "guestip";
public static final String REMOVED = "removed";
public static final String IKE_POLICY = "ikepolicy";
public static final String ESP_POLICY = "esppolicy";
public static final String LIFETIME = "lifetime";
public static final String FOR_VPC = "forvpc";
=======
public static final String NICIRA_NVP_DEVICE_ID = "nvpdeviceid";
public static final String NICIRA_NVP_TRANSPORT_ZONE_UUID = "transportzoneuuid";
public static final String NICIRA_NVP_DEVICE_NAME = "niciradevicename";
>>>>>>>
public static final String S2S_VPN_GATEWAY_ID = "s2svpngatewayid";
public static final String S2S_CUSTOMER_GATEWAY_ID = "s2scustomergatewayid";
public static final String IPSEC_PSK = "ipsecpsk";
public static final String GUEST_IP = "guestip";
public static final String REMOVED = "removed";
public static final String IKE_POLICY = "ikepolicy";
public static final String ESP_POLICY = "esppolicy";
public static final String LIFETIME = "lifetime";
public static final String FOR_VPC = "forvpc";
public static final String NICIRA_NVP_DEVICE_ID = "nvpdeviceid";
public static final String NICIRA_NVP_TRANSPORT_ZONE_UUID = "transportzoneuuid";
public static final String NICIRA_NVP_DEVICE_NAME = "niciradevicename"; |
<<<<<<<
List<? extends Swift> discoverSwift(AddSwiftCmd addSwiftCmd) throws DiscoveryException;
=======
List<HypervisorType> getSupportedHypervisorTypes(long zoneId);
>>>>>>>
List<? extends Swift> discoverSwift(AddSwiftCmd addSwiftCmd) throws DiscoveryException;
List<HypervisorType> getSupportedHypervisorTypes(long zoneId); |
<<<<<<<
import com.cloud.dc.Vlan;
=======
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
import javax.inject.Inject;
import net.nuage.vsp.acs.client.api.model.VspAclRule;
import net.nuage.vsp.acs.client.api.model.VspDomain;
import net.nuage.vsp.acs.client.api.model.VspNetwork;
import net.nuage.vsp.acs.client.api.model.VspNic;
import net.nuage.vsp.acs.client.api.model.VspStaticNat;
import net.nuage.vsp.acs.client.api.model.VspVm;
import net.nuage.vsp.acs.client.common.model.Pair;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
>>>>>>>
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import javax.annotation.Nullable;
import javax.inject.Inject;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import com.cloud.dc.Vlan;
<<<<<<<
import com.cloud.vm.dao.VMInstanceDao;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import net.nuage.vsp.acs.client.api.model.VspAclRule;
import net.nuage.vsp.acs.client.api.model.VspDhcpDomainOption;
import net.nuage.vsp.acs.client.api.model.VspAddressRange;
import net.nuage.vsp.acs.client.api.model.VspDhcpVMOption;
import net.nuage.vsp.acs.client.api.model.VspDomain;
import net.nuage.vsp.acs.client.api.model.VspDomainCleanUp;
import net.nuage.vsp.acs.client.api.model.VspNetwork;
import net.nuage.vsp.acs.client.api.model.VspNic;
import net.nuage.vsp.acs.client.api.model.VspStaticNat;
import net.nuage.vsp.acs.client.api.model.VspVm;
import net.nuage.vsp.acs.client.common.model.Pair;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import javax.annotation.Nullable;
import javax.inject.Inject;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
=======
>>>>>>>
import com.cloud.vm.dao.VMInstanceDao;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import net.nuage.vsp.acs.client.api.model.VspAclRule;
import net.nuage.vsp.acs.client.api.model.VspAddressRange;
import net.nuage.vsp.acs.client.api.model.VspDhcpDomainOption;
import net.nuage.vsp.acs.client.api.model.VspDhcpVMOption;
import net.nuage.vsp.acs.client.api.model.VspDomain;
import net.nuage.vsp.acs.client.api.model.VspDomainCleanUp;
import net.nuage.vsp.acs.client.api.model.VspNetwork;
import net.nuage.vsp.acs.client.api.model.VspNic;
import net.nuage.vsp.acs.client.api.model.VspStaticNat;
import net.nuage.vsp.acs.client.api.model.VspVm;
import net.nuage.vsp.acs.client.common.model.Pair;
<<<<<<<
/** Build VspDhcpVMOption to put on the VM interface */
public VspDhcpVMOption buildVmDhcpOption (NicVO userNic, boolean defaultHasDns, boolean networkHasDns) {
VMInstanceVO userVm = _vmInstanceDao.findById(userNic.getInstanceId());
VspDhcpVMOption.Builder vspDhcpVMOptionBuilder = new VspDhcpVMOption.Builder()
.nicUuid(userNic.getUuid())
.defaultHasDns(defaultHasDns)
.hostname(userVm.getHostName())
.networkHasDns(networkHasDns)
.isDefaultInterface(userNic.isDefaultNic())
.domainRouter(VirtualMachine.Type.DomainRouter.equals(userNic.getVmType()));
return vspDhcpVMOptionBuilder.build();
}
/** Build VspDhcpVMOption to put on the subnet */
public VspDhcpDomainOption buildNetworkDhcpOption(Network network, NetworkOffering offering) {
List<String> dnsProvider = _ntwkOfferingSrvcDao.listProvidersForServiceForNetworkOffering(offering.getId(), Network.Service.Dns);
boolean isVrDnsProvider = dnsProvider.contains("VirtualRouter") || dnsProvider.contains("VpcVirtualRouter");
VspDhcpDomainOption.Builder vspDhcpDomainBuilder = new VspDhcpDomainOption.Builder()
.dnsServers(_nuageVspManager.getDnsDetails(network.getDataCenterId()))
.vrIsDnsProvider(isVrDnsProvider);
if (isVrDnsProvider) {
vspDhcpDomainBuilder.networkDomain(network.getVpcId() != null ? _vpcDao.findById(network.getVpcId()).getNetworkDomain() : network.getNetworkDomain());
}
return vspDhcpDomainBuilder.build();
}
=======
private <E extends Enum<E>> E getEnumValue(Enum cloudstackValue, Class<E> target) {
try {
return Enum.valueOf(target, cloudstackValue.name());
} catch (IllegalArgumentException e) {
return null;
}
}
private <E extends Enum<E>> E getEnumValue(Enum cloudstackValue, E defaultValue) {
try {
return Enum.valueOf(defaultValue.getDeclaringClass(), cloudstackValue.name());
} catch (IllegalArgumentException e) {
return defaultValue;
}
}
>>>>>>>
/** Build VspDhcpVMOption to put on the VM interface */
public VspDhcpVMOption buildVmDhcpOption (NicVO userNic, boolean defaultHasDns, boolean networkHasDns) {
VMInstanceVO userVm = _vmInstanceDao.findById(userNic.getInstanceId());
VspDhcpVMOption.Builder vspDhcpVMOptionBuilder = new VspDhcpVMOption.Builder()
.nicUuid(userNic.getUuid())
.defaultHasDns(defaultHasDns)
.hostname(userVm.getHostName())
.networkHasDns(networkHasDns)
.isDefaultInterface(userNic.isDefaultNic())
.domainRouter(VirtualMachine.Type.DomainRouter.equals(userNic.getVmType()));
return vspDhcpVMOptionBuilder.build();
}
/** Build VspDhcpVMOption to put on the subnet */
public VspDhcpDomainOption buildNetworkDhcpOption(Network network, NetworkOffering offering) {
List<String> dnsProvider = _ntwkOfferingSrvcDao.listProvidersForServiceForNetworkOffering(offering.getId(), Network.Service.Dns);
boolean isVrDnsProvider = dnsProvider.contains("VirtualRouter") || dnsProvider.contains("VpcVirtualRouter");
VspDhcpDomainOption.Builder vspDhcpDomainBuilder = new VspDhcpDomainOption.Builder()
.dnsServers(_nuageVspManager.getDnsDetails(network.getDataCenterId()))
.vrIsDnsProvider(isVrDnsProvider);
if (isVrDnsProvider) {
vspDhcpDomainBuilder.networkDomain(network.getVpcId() != null ? _vpcDao.findById(network.getVpcId()).getNetworkDomain() : network.getNetworkDomain());
}
return vspDhcpDomainBuilder.build();
}
private <E extends Enum<E>> E getEnumValue(Enum cloudstackValue, Class<E> target) {
try {
return Enum.valueOf(target, cloudstackValue.name());
} catch (IllegalArgumentException e) {
return null;
}
}
private <E extends Enum<E>> E getEnumValue(Enum cloudstackValue, E defaultValue) {
try {
return Enum.valueOf(defaultValue.getDeclaringClass(), cloudstackValue.name());
} catch (IllegalArgumentException e) {
return defaultValue;
}
} |
<<<<<<<
import java.util.List;
import java.util.UUID;
=======
>>>>>>>
import java.util.List;
import java.util.UUID;
import javax.persistence.CollectionTable;
<<<<<<<
@Column(name="is_security_group_enabled")
boolean securityGroupEnabled;
@ElementCollection(targetClass = String.class, fetch=FetchType.EAGER)
@Column(name="tag")
@CollectionTable(name="network_tags", joinColumns=@JoinColumn(name="network_id"))
List<String> tags;
@Column(name="uuid")
String uuid;
=======
@Column(name="guest_type")
@Enumerated(value=EnumType.STRING)
Network.GuestType guestType;
>>>>>>>
@Column(name="is_security_group_enabled")
boolean securityGroupEnabled;
@ElementCollection(targetClass = String.class, fetch=FetchType.EAGER)
@Column(name="tag")
@CollectionTable(name="network_tags", joinColumns=@JoinColumn(name="network_id"))
List<String> tags;
@Column(name="uuid")
String uuid;
@Column(name="guest_type")
@Enumerated(value=EnumType.STRING)
Network.GuestType guestType;
<<<<<<<
this.guestType = guestType;
this.uuid = UUID.randomUUID().toString();
=======
>>>>>>>
this.guestType = guestType;
this.uuid = UUID.randomUUID().toString();
<<<<<<<
this.uuid = UUID.randomUUID().toString();
=======
this.guestType = guestType;
this.isShared = isShared;
>>>>>>>
this.uuid = UUID.randomUUID().toString();
this.guestType = guestType;
this.isShared = isShared;
<<<<<<<
@Override
public String getUuid() {
return this.uuid;
}
public void setUuid(String uuid) {
this.uuid = uuid;
}
=======
@Override
public boolean getIsShared() {
return isShared;
}
>>>>>>>
@Override
public String getUuid() {
return this.uuid;
}
public void setUuid(String uuid) {
this.uuid = uuid;
}
@Override
public boolean getIsShared() {
return isShared;
} |
<<<<<<<
import com.cloud.agent.manager.AgentManager;
=======
import com.cloud.agent.api.to.NicTO;
>>>>>>>
import com.cloud.agent.api.to.NicTO;
import com.cloud.agent.manager.AgentManager;
<<<<<<<
import com.cloud.dc.VlanVO;
import com.cloud.dc.dao.AccountVlanMapDao;
=======
import com.cloud.dc.VlanVO;
>>>>>>>
import com.cloud.dc.VlanVO;
import com.cloud.dc.dao.AccountVlanMapDao;
<<<<<<<
import com.cloud.network.dao.LoadBalancerVMMapDao;
import com.cloud.network.dao.NetworkRuleConfigDao;
import com.cloud.network.dao.SecurityGroupDao;
=======
import com.cloud.network.dao.NetworkConfigurationDao;
>>>>>>>
import com.cloud.network.dao.LoadBalancerVMMapDao;
import com.cloud.network.dao.NetworkConfigurationDao;
import com.cloud.network.dao.NetworkRuleConfigDao;
import com.cloud.network.dao.SecurityGroupDao;
<<<<<<<
=======
import com.cloud.vm.VirtualMachineProfile;
>>>>>>>
import com.cloud.vm.VirtualMachineProfile;
<<<<<<<
@Inject UserStatisticsDao _statsDao;
@Inject UserVmDao _userVmDao;
@Inject FirewallRulesDao _firewallRulesDao;
@Inject NetworkRuleConfigDao _networkRuleConfigDao;
@Inject AccountVlanMapDao _accountVlanMapDao;
=======
@Inject UserStatisticsDao _statsDao = null;
@Inject NetworkOfferingDao _networkOfferingDao = null;
@Inject NetworkConfigurationDao _networkProfileDao = null;
@Inject NicDao _nicDao;
@Inject(adapter=NetworkGuru.class)
Adapters<NetworkGuru> _networkGurus;
@Inject(adapter=NetworkElement.class)
Adapters<NetworkElement> _networkElements;
>>>>>>>
@Inject UserVmDao _userVmDao;
@Inject FirewallRulesDao _firewallRulesDao;
@Inject NetworkRuleConfigDao _networkRuleConfigDao;
@Inject AccountVlanMapDao _accountVlanMapDao;
@Inject UserStatisticsDao _statsDao = null;
@Inject NetworkOfferingDao _networkOfferingDao = null;
@Inject NetworkConfigurationDao _networkProfileDao = null;
@Inject NicDao _nicDao;
@Inject(adapter=NetworkGuru.class)
Adapters<NetworkGuru> _networkGurus;
@Inject(adapter=NetworkElement.class)
Adapters<NetworkElement> _networkElements; |
<<<<<<<
CommonProxy.manager.restoreDamageControl(this, this.world);
=======
>>>>>>> |
<<<<<<<
import com.cloud.network.dao.PhysicalNetworkVO;
=======
import com.cloud.network.dao.UserIpv6AddressDao;
>>>>>>>
import com.cloud.network.dao.PhysicalNetworkVO;
import com.cloud.network.dao.UserIpv6AddressDao;
<<<<<<<
PhysicalNetwork pNtwk, long zoneId, ACLType aclType, Boolean subdomainAccess, Long vpcId)
=======
PhysicalNetwork pNtwk, long zoneId, ACLType aclType, Boolean subdomainAccess, Long vpcId, String ip6Gateway, String ip6Cidr)
>>>>>>>
PhysicalNetwork pNtwk, long zoneId, ACLType aclType, Boolean subdomainAccess, Long vpcId, String ip6Gateway, String ip6Cidr)
<<<<<<<
@Override
public void allocateDirectIp(NicProfile nic, DataCenter dc, VirtualMachineProfile<? extends VirtualMachine> vm, Network network, String requestedIp) throws InsufficientVirtualNetworkCapcityException,
InsufficientAddressCapacityException {
if (nic.getIp4Address() == null) {
PublicIp ip = assignPublicIpAddress(dc.getId(), null, vm.getOwner(), VlanType.DirectAttached, network.getId(), requestedIp, false);
nic.setIp4Address(ip.getAddress().toString());
nic.setGateway(ip.getGateway());
nic.setNetmask(ip.getNetmask());
nic.setIsolationUri(IsolationType.Vlan.toUri(ip.getVlanTag()));
nic.setBroadcastType(BroadcastDomainType.Vlan);
nic.setBroadcastUri(BroadcastDomainType.Vlan.toUri(ip.getVlanTag()));
nic.setFormat(AddressFormat.Ip4);
nic.setReservationId(String.valueOf(ip.getVlanTag()));
nic.setMacAddress(ip.getMacAddress());
}
=======
public void allocateDirectIp(NicProfile nic, DataCenter dc, VirtualMachineProfile<? extends VirtualMachine> vm, Network network,
String requestedIpv4, String requestedIpv6) throws InsufficientVirtualNetworkCapcityException,
InsufficientAddressCapacityException {
boolean ipv4 = false, ipv6 = false;
if (network.getGateway() != null) {
if (nic.getIp4Address() == null) {
ipv4 = true;
PublicIp ip = assignPublicIpAddress(dc.getId(), null, vm.getOwner(), VlanType.DirectAttached, network.getId(), requestedIpv4, false);
nic.setIp4Address(ip.getAddress().toString());
nic.setGateway(ip.getGateway());
nic.setNetmask(ip.getNetmask());
nic.setIsolationUri(IsolationType.Vlan.toUri(ip.getVlanTag()));
nic.setBroadcastType(BroadcastDomainType.Vlan);
nic.setBroadcastUri(BroadcastDomainType.Vlan.toUri(ip.getVlanTag()));
nic.setFormat(AddressFormat.Ip4);
nic.setReservationId(String.valueOf(ip.getVlanTag()));
nic.setMacAddress(ip.getMacAddress());
}
}
if (network.getIp6Gateway() != null) {
if (nic.getIp6Address() == null) {
ipv6 = true;
UserIpv6Address ip = _ipv6Mgr.assignDirectIp6Address(dc.getId(), vm.getOwner(), network.getId(), requestedIpv6);
Vlan vlan = _networkModel.getVlanForNetwork(network.getId());
if (vlan == null) {
s_logger.debug("Cannot find related vlan or too many vlan attached to network " + network.getId());
return;
}
nic.setIp6Address(ip.getAddress().toString());
nic.setIp6Gateway(vlan.getIp6Gateway());
nic.setIp6Cidr(vlan.getIp6Cidr());
if (ipv4) {
nic.setFormat(AddressFormat.DualStack);
} else {
nic.setIsolationUri(IsolationType.Vlan.toUri(vlan.getVlanTag()));
nic.setBroadcastType(BroadcastDomainType.Vlan);
nic.setBroadcastUri(BroadcastDomainType.Vlan.toUri(vlan.getVlanTag()));
nic.setFormat(AddressFormat.Ip6);
nic.setReservationId(String.valueOf(vlan.getVlanTag()));
nic.setMacAddress(ip.getMacAddress());
}
}
}
>>>>>>>
public void allocateDirectIp(NicProfile nic, DataCenter dc, VirtualMachineProfile<? extends VirtualMachine> vm, Network network,
String requestedIpv4, String requestedIpv6) throws InsufficientVirtualNetworkCapcityException,
InsufficientAddressCapacityException {
boolean ipv4 = false, ipv6 = false;
if (network.getGateway() != null) {
if (nic.getIp4Address() == null) {
ipv4 = true;
PublicIp ip = assignPublicIpAddress(dc.getId(), null, vm.getOwner(), VlanType.DirectAttached, network.getId(), requestedIpv4, false);
nic.setIp4Address(ip.getAddress().toString());
nic.setGateway(ip.getGateway());
nic.setNetmask(ip.getNetmask());
nic.setIsolationUri(IsolationType.Vlan.toUri(ip.getVlanTag()));
nic.setBroadcastType(BroadcastDomainType.Vlan);
nic.setBroadcastUri(BroadcastDomainType.Vlan.toUri(ip.getVlanTag()));
nic.setFormat(AddressFormat.Ip4);
nic.setReservationId(String.valueOf(ip.getVlanTag()));
nic.setMacAddress(ip.getMacAddress());
}
}
if (network.getIp6Gateway() != null) {
if (nic.getIp6Address() == null) {
ipv6 = true;
UserIpv6Address ip = _ipv6Mgr.assignDirectIp6Address(dc.getId(), vm.getOwner(), network.getId(), requestedIpv6);
Vlan vlan = _networkModel.getVlanForNetwork(network.getId());
if (vlan == null) {
s_logger.debug("Cannot find related vlan or too many vlan attached to network " + network.getId());
return;
}
nic.setIp6Address(ip.getAddress().toString());
nic.setIp6Gateway(vlan.getIp6Gateway());
nic.setIp6Cidr(vlan.getIp6Cidr());
if (ipv4) {
nic.setFormat(AddressFormat.DualStack);
} else {
nic.setIsolationUri(IsolationType.Vlan.toUri(vlan.getVlanTag()));
nic.setBroadcastType(BroadcastDomainType.Vlan);
nic.setBroadcastUri(BroadcastDomainType.Vlan.toUri(vlan.getVlanTag()));
nic.setFormat(AddressFormat.Ip6);
nic.setReservationId(String.valueOf(vlan.getVlanTag()));
nic.setMacAddress(ip.getMacAddress());
}
}
}
<<<<<<<
@Override
=======
@Override
>>>>>>>
@Override |
<<<<<<<
@Component
@Local(value = NetworkElement.class)
=======
@Local(value = {NetworkElement.class, FirewallServiceProvider.class,
PortForwardingServiceProvider.class, IpDeployer.class,
SourceNatServiceProvider.class, RemoteAccessVPNServiceProvider.class})
>>>>>>>
@Component
@Local(value = {NetworkElement.class, FirewallServiceProvider.class,
PortForwardingServiceProvider.class, IpDeployer.class,
SourceNatServiceProvider.class, RemoteAccessVPNServiceProvider.class}) |
<<<<<<<
import com.cloud.region.ha.GlobalLoadBalancerRule;
import javax.persistence.*;
import org.apache.cloudstack.acl.AclEntityType;
=======
>>>>>>> |
<<<<<<<
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
import org.apache.cloudstack.api.ApiConstants.HostDetails;
import org.apache.cloudstack.api.ApiConstants.VMDetails;
import org.apache.cloudstack.api.response.AccountResponse;
import org.apache.cloudstack.api.response.AsyncJobResponse;
import org.apache.cloudstack.api.response.DiskOfferingResponse;
import org.apache.cloudstack.api.response.DomainRouterResponse;
import org.apache.cloudstack.api.response.EventResponse;
import org.apache.cloudstack.api.response.HostResponse;
import org.apache.cloudstack.api.response.InstanceGroupResponse;
import org.apache.cloudstack.api.response.ProjectAccountResponse;
import org.apache.cloudstack.api.response.ProjectInvitationResponse;
import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.ResourceTagResponse;
import org.apache.cloudstack.api.response.SecurityGroupResponse;
import org.apache.cloudstack.api.response.ServiceOfferingResponse;
import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.cloudstack.api.response.UserResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.springframework.stereotype.Component;
import com.cloud.api.query.dao.AccountJoinDao;
import com.cloud.api.query.dao.AsyncJobJoinDao;
import com.cloud.api.query.dao.DataCenterJoinDao;
import com.cloud.api.query.dao.DiskOfferingJoinDao;
import com.cloud.api.query.dao.DomainRouterJoinDao;
import com.cloud.api.query.dao.HostJoinDao;
import com.cloud.api.query.dao.InstanceGroupJoinDao;
import com.cloud.api.query.dao.ProjectAccountJoinDao;
import com.cloud.api.query.dao.ProjectInvitationJoinDao;
import com.cloud.api.query.dao.ProjectJoinDao;
import com.cloud.api.query.dao.ResourceTagJoinDao;
import com.cloud.api.query.dao.SecurityGroupJoinDao;
import com.cloud.api.query.dao.ServiceOfferingJoinDao;
import com.cloud.api.query.dao.StoragePoolJoinDao;
import com.cloud.api.query.dao.UserAccountJoinDao;
import com.cloud.api.query.dao.UserVmJoinDao;
import com.cloud.api.query.dao.VolumeJoinDao;
import com.cloud.api.query.vo.AccountJoinVO;
import com.cloud.api.query.vo.AsyncJobJoinVO;
import com.cloud.api.query.vo.DataCenterJoinVO;
import com.cloud.api.query.vo.DiskOfferingJoinVO;
import com.cloud.api.query.vo.DomainRouterJoinVO;
import com.cloud.api.query.vo.EventJoinVO;
import com.cloud.api.query.vo.HostJoinVO;
import com.cloud.api.query.vo.InstanceGroupJoinVO;
import com.cloud.api.query.vo.ProjectAccountJoinVO;
import com.cloud.api.query.vo.ProjectInvitationJoinVO;
import com.cloud.api.query.vo.ProjectJoinVO;
import com.cloud.api.query.vo.ResourceTagJoinVO;
import com.cloud.api.query.vo.SecurityGroupJoinVO;
import com.cloud.api.query.vo.ServiceOfferingJoinVO;
import com.cloud.api.query.vo.StoragePoolJoinVO;
import com.cloud.api.query.vo.UserAccountJoinVO;
import com.cloud.api.query.vo.UserVmJoinVO;
import com.cloud.api.query.vo.VolumeJoinVO;
=======
import com.cloud.api.query.dao.*;
import com.cloud.api.query.vo.*;
>>>>>>>
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
import org.apache.cloudstack.api.ApiConstants.HostDetails;
import org.apache.cloudstack.api.ApiConstants.VMDetails;
import org.apache.cloudstack.api.response.AccountResponse;
import org.apache.cloudstack.api.response.AsyncJobResponse;
import org.apache.cloudstack.api.response.DiskOfferingResponse;
import org.apache.cloudstack.api.response.DomainRouterResponse;
import org.apache.cloudstack.api.response.EventResponse;
import org.apache.cloudstack.api.response.HostResponse;
import org.apache.cloudstack.api.response.InstanceGroupResponse;
import org.apache.cloudstack.api.response.ProjectAccountResponse;
import org.apache.cloudstack.api.response.ProjectInvitationResponse;
import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.ResourceTagResponse;
import org.apache.cloudstack.api.response.SecurityGroupResponse;
import org.apache.cloudstack.api.response.ServiceOfferingResponse;
import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.cloudstack.api.response.UserResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.springframework.stereotype.Component;
import com.cloud.api.query.dao.AccountJoinDao;
import com.cloud.api.query.dao.AsyncJobJoinDao;
import com.cloud.api.query.dao.DataCenterJoinDao;
import com.cloud.api.query.dao.DiskOfferingJoinDao;
import com.cloud.api.query.dao.DomainRouterJoinDao;
import com.cloud.api.query.dao.HostJoinDao;
import com.cloud.api.query.dao.InstanceGroupJoinDao;
import com.cloud.api.query.dao.ProjectAccountJoinDao;
import com.cloud.api.query.dao.ProjectInvitationJoinDao;
import com.cloud.api.query.dao.ProjectJoinDao;
import com.cloud.api.query.dao.ResourceTagJoinDao;
import com.cloud.api.query.dao.SecurityGroupJoinDao;
import com.cloud.api.query.dao.ServiceOfferingJoinDao;
import com.cloud.api.query.dao.StoragePoolJoinDao;
import com.cloud.api.query.dao.UserAccountJoinDao;
import com.cloud.api.query.dao.UserVmJoinDao;
import com.cloud.api.query.dao.VolumeJoinDao;
import com.cloud.api.query.vo.AccountJoinVO;
import com.cloud.api.query.vo.AsyncJobJoinVO;
import com.cloud.api.query.vo.DataCenterJoinVO;
import com.cloud.api.query.vo.DiskOfferingJoinVO;
import com.cloud.api.query.vo.DomainRouterJoinVO;
import com.cloud.api.query.vo.EventJoinVO;
import com.cloud.api.query.vo.HostJoinVO;
import com.cloud.api.query.vo.InstanceGroupJoinVO;
import com.cloud.api.query.vo.ProjectAccountJoinVO;
import com.cloud.api.query.vo.ProjectInvitationJoinVO;
import com.cloud.api.query.vo.ProjectJoinVO;
import com.cloud.api.query.vo.ResourceTagJoinVO;
import com.cloud.api.query.vo.SecurityGroupJoinVO;
import com.cloud.api.query.vo.ServiceOfferingJoinVO;
import com.cloud.api.query.vo.StoragePoolJoinVO;
import com.cloud.api.query.vo.UserAccountJoinVO;
import com.cloud.api.query.vo.UserVmJoinVO;
import com.cloud.api.query.vo.VolumeJoinVO;
import com.cloud.api.query.dao.*;
import com.cloud.api.query.vo.*;
<<<<<<<
import com.cloud.network.IpAddress;
import com.cloud.network.Network;
=======
import com.cloud.network.*;
>>>>>>>
import com.cloud.network.IpAddress;
import com.cloud.network.Network;
<<<<<<<
import com.cloud.network.NetworkManager;
import com.cloud.network.NetworkModel;
import com.cloud.network.NetworkProfile;
=======
>>>>>>>
import com.cloud.network.NetworkManager;
import com.cloud.network.NetworkModel;
import com.cloud.network.NetworkProfile;
<<<<<<<
import com.cloud.network.PhysicalNetworkServiceProvider;
import com.cloud.network.as.AutoScalePolicy;
import com.cloud.network.as.AutoScalePolicyConditionMapVO;
import com.cloud.network.as.AutoScalePolicyVO;
import com.cloud.network.as.AutoScaleVmGroupPolicyMapVO;
import com.cloud.network.as.AutoScaleVmGroupVO;
import com.cloud.network.as.AutoScaleVmProfileVO;
import com.cloud.network.as.ConditionVO;
import com.cloud.network.as.CounterVO;
import com.cloud.network.as.dao.AutoScalePolicyConditionMapDao;
import com.cloud.network.as.dao.AutoScalePolicyDao;
import com.cloud.network.as.dao.AutoScaleVmGroupDao;
import com.cloud.network.as.dao.AutoScaleVmGroupPolicyMapDao;
import com.cloud.network.as.dao.AutoScaleVmProfileDao;
import com.cloud.network.as.dao.ConditionDao;
import com.cloud.network.as.dao.CounterDao;
import com.cloud.network.dao.FirewallRulesCidrsDao;
import com.cloud.network.dao.FirewallRulesDao;
import com.cloud.network.dao.IPAddressDao;
import com.cloud.network.dao.IPAddressVO;
import com.cloud.network.dao.LoadBalancerDao;
import com.cloud.network.dao.LoadBalancerVO;
import com.cloud.network.dao.NetworkDao;
import com.cloud.network.dao.NetworkDomainDao;
import com.cloud.network.dao.NetworkDomainVO;
import com.cloud.network.dao.NetworkRuleConfigDao;
import com.cloud.network.dao.NetworkRuleConfigVO;
import com.cloud.network.dao.NetworkVO;
import com.cloud.network.dao.PhysicalNetworkDao;
import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
import com.cloud.network.dao.PhysicalNetworkServiceProviderVO;
import com.cloud.network.dao.PhysicalNetworkTrafficTypeDao;
import com.cloud.network.dao.PhysicalNetworkTrafficTypeVO;
import com.cloud.network.dao.PhysicalNetworkVO;
import com.cloud.network.dao.Site2SiteCustomerGatewayDao;
import com.cloud.network.dao.Site2SiteCustomerGatewayVO;
import com.cloud.network.dao.Site2SiteVpnGatewayDao;
import com.cloud.network.dao.Site2SiteVpnGatewayVO;
=======
import com.cloud.network.as.*;
import com.cloud.network.as.dao.*;
import com.cloud.network.dao.*;
>>>>>>>
import com.cloud.network.PhysicalNetworkServiceProvider;
import com.cloud.network.as.AutoScalePolicy;
import com.cloud.network.as.AutoScalePolicyConditionMapVO;
import com.cloud.network.as.AutoScalePolicyVO;
import com.cloud.network.as.AutoScaleVmGroupPolicyMapVO;
import com.cloud.network.as.AutoScaleVmGroupVO;
import com.cloud.network.as.AutoScaleVmProfileVO;
import com.cloud.network.as.ConditionVO;
import com.cloud.network.as.CounterVO;
import com.cloud.network.as.dao.AutoScalePolicyConditionMapDao;
import com.cloud.network.as.dao.AutoScalePolicyDao;
import com.cloud.network.as.dao.AutoScaleVmGroupDao;
import com.cloud.network.as.dao.AutoScaleVmGroupPolicyMapDao;
import com.cloud.network.as.dao.AutoScaleVmProfileDao;
import com.cloud.network.as.dao.ConditionDao;
import com.cloud.network.as.dao.CounterDao;
import com.cloud.network.dao.FirewallRulesCidrsDao;
import com.cloud.network.dao.FirewallRulesDao;
import com.cloud.network.dao.IPAddressDao;
import com.cloud.network.dao.IPAddressVO;
import com.cloud.network.dao.LoadBalancerDao;
import com.cloud.network.dao.LoadBalancerVO;
import com.cloud.network.dao.NetworkDao;
import com.cloud.network.dao.NetworkDomainDao;
import com.cloud.network.dao.NetworkDomainVO;
import com.cloud.network.dao.NetworkRuleConfigDao;
import com.cloud.network.dao.NetworkRuleConfigVO;
import com.cloud.network.dao.NetworkVO;
import com.cloud.network.dao.PhysicalNetworkDao;
import com.cloud.network.dao.PhysicalNetworkServiceProviderDao;
import com.cloud.network.dao.PhysicalNetworkServiceProviderVO;
import com.cloud.network.dao.PhysicalNetworkTrafficTypeDao;
import com.cloud.network.dao.PhysicalNetworkTrafficTypeVO;
import com.cloud.network.dao.PhysicalNetworkVO;
import com.cloud.network.dao.Site2SiteCustomerGatewayDao;
import com.cloud.network.dao.Site2SiteCustomerGatewayVO;
import com.cloud.network.dao.Site2SiteVpnGatewayDao;
import com.cloud.network.dao.Site2SiteVpnGatewayVO;
import com.cloud.network.*;
import com.cloud.network.as.*;
import com.cloud.network.as.dao.*;
import com.cloud.network.dao.*;
<<<<<<<
import com.cloud.vm.ConsoleProxyVO;
import com.cloud.vm.DomainRouterVO;
import com.cloud.vm.InstanceGroup;
import com.cloud.vm.InstanceGroupVO;
import com.cloud.vm.NicProfile;
import com.cloud.vm.UserVmDetailVO;
import com.cloud.vm.UserVmManager;
import com.cloud.vm.UserVmVO;
import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VmStats;
import com.cloud.vm.dao.ConsoleProxyDao;
import com.cloud.vm.dao.DomainRouterDao;
import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.dao.UserVmDetailsDao;
import com.cloud.vm.dao.VMInstanceDao;
=======
import com.cloud.utils.component.ComponentLocator;
import com.cloud.vm.*;
import com.cloud.vm.dao.*;
import org.apache.cloudstack.api.ApiConstants.HostDetails;
import org.apache.cloudstack.api.ApiConstants.VMDetails;
import org.apache.cloudstack.api.response.*;
import java.util.*;
>>>>>>>
import com.cloud.vm.ConsoleProxyVO;
import com.cloud.vm.DomainRouterVO;
import com.cloud.vm.InstanceGroup;
import com.cloud.vm.InstanceGroupVO;
import com.cloud.vm.NicProfile;
import com.cloud.vm.UserVmDetailVO;
import com.cloud.vm.UserVmManager;
import com.cloud.vm.UserVmVO;
import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VmStats;
import com.cloud.vm.dao.ConsoleProxyDao;
import com.cloud.vm.dao.DomainRouterDao;
import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.dao.UserVmDetailsDao;
import com.cloud.vm.dao.VMInstanceDao; |
<<<<<<<
import org.apache.cloudstack.api.response.AsyncJobResponse;
import org.apache.cloudstack.api.response.AutoScalePolicyResponse;
import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse;
import org.apache.cloudstack.api.response.AutoScaleVmProfileResponse;
import org.apache.cloudstack.api.response.CapabilityResponse;
import org.apache.cloudstack.api.response.CapacityResponse;
import org.apache.cloudstack.api.response.ClusterResponse;
import org.apache.cloudstack.api.response.ConditionResponse;
import org.apache.cloudstack.api.response.ConfigurationResponse;
import org.apache.cloudstack.api.response.ControlledEntityResponse;
import org.apache.cloudstack.api.response.CounterResponse;
import org.apache.cloudstack.api.response.CreateCmdResponse;
import org.apache.cloudstack.api.response.DiskOfferingResponse;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.DomainRouterResponse;
import org.apache.cloudstack.api.response.EventResponse;
import org.apache.cloudstack.api.response.ExtractResponse;
import org.apache.cloudstack.api.response.FirewallResponse;
import org.apache.cloudstack.api.response.FirewallRuleResponse;
import org.apache.cloudstack.api.response.GuestOSResponse;
import org.apache.cloudstack.api.response.HostResponse;
import org.apache.cloudstack.api.response.HypervisorCapabilitiesResponse;
import org.apache.cloudstack.api.response.ControlledViewEntityResponse;
import org.apache.cloudstack.api.response.IPAddressResponse;
import org.apache.cloudstack.api.response.InstanceGroupResponse;
import org.apache.cloudstack.api.response.IpForwardingRuleResponse;
import org.apache.cloudstack.api.response.LBStickinessPolicyResponse;
import org.apache.cloudstack.api.response.LBStickinessResponse;
import org.apache.cloudstack.api.response.LDAPConfigResponse;
import org.apache.cloudstack.api.response.LoadBalancerResponse;
import org.apache.cloudstack.api.response.NetworkACLResponse;
import org.apache.cloudstack.api.response.NetworkOfferingResponse;
import org.apache.cloudstack.api.response.NetworkResponse;
import org.apache.cloudstack.api.response.PhysicalNetworkResponse;
import org.apache.cloudstack.api.response.PodResponse;
import org.apache.cloudstack.api.response.PrivateGatewayResponse;
import org.apache.cloudstack.api.response.ProjectAccountResponse;
import org.apache.cloudstack.api.response.ProjectInvitationResponse;
import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.ProviderResponse;
import org.apache.cloudstack.api.response.RemoteAccessVpnResponse;
import org.apache.cloudstack.api.response.ResourceCountResponse;
import org.apache.cloudstack.api.response.ResourceLimitResponse;
import org.apache.cloudstack.api.response.ResourceTagResponse;
import org.apache.cloudstack.api.response.SecurityGroupResponse;
import org.apache.cloudstack.api.response.SecurityGroupRuleResponse;
import org.apache.cloudstack.api.response.ServiceOfferingResponse;
import org.apache.cloudstack.api.response.ServiceResponse;
import org.apache.cloudstack.api.response.Site2SiteCustomerGatewayResponse;
import org.apache.cloudstack.api.response.Site2SiteVpnConnectionResponse;
import org.apache.cloudstack.api.response.Site2SiteVpnGatewayResponse;
import org.apache.cloudstack.api.response.SnapshotPolicyResponse;
import org.apache.cloudstack.api.response.SnapshotResponse;
import org.apache.cloudstack.api.response.SnapshotScheduleResponse;
import org.apache.cloudstack.api.response.StaticRouteResponse;
import org.apache.cloudstack.api.response.StorageNetworkIpRangeResponse;
import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.cloudstack.api.response.SwiftResponse;
import org.apache.cloudstack.api.response.SystemVmInstanceResponse;
import org.apache.cloudstack.api.response.SystemVmResponse;
import org.apache.cloudstack.api.response.TemplatePermissionsResponse;
import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.TrafficTypeResponse;
import org.apache.cloudstack.api.response.UserResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.VirtualRouterProviderResponse;
import org.apache.cloudstack.api.response.VlanIpRangeResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.api.response.VpcOfferingResponse;
import org.apache.cloudstack.api.response.VpcResponse;
import org.apache.cloudstack.api.response.VpnUsersResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.api.response.S3Response;
import org.springframework.stereotype.Component;
=======
>>>>>>>
import org.apache.cloudstack.api.response.AsyncJobResponse;
import org.apache.cloudstack.api.response.AutoScalePolicyResponse;
import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse;
import org.apache.cloudstack.api.response.AutoScaleVmProfileResponse;
import org.apache.cloudstack.api.response.CapabilityResponse;
import org.apache.cloudstack.api.response.CapacityResponse;
import org.apache.cloudstack.api.response.ClusterResponse;
import org.apache.cloudstack.api.response.ConditionResponse;
import org.apache.cloudstack.api.response.ConfigurationResponse;
import org.apache.cloudstack.api.response.ControlledEntityResponse;
import org.apache.cloudstack.api.response.CounterResponse;
import org.apache.cloudstack.api.response.CreateCmdResponse;
import org.apache.cloudstack.api.response.DiskOfferingResponse;
import org.apache.cloudstack.api.response.DomainResponse;
import org.apache.cloudstack.api.response.DomainRouterResponse;
import org.apache.cloudstack.api.response.EventResponse;
import org.apache.cloudstack.api.response.ExtractResponse;
import org.apache.cloudstack.api.response.FirewallResponse;
import org.apache.cloudstack.api.response.FirewallRuleResponse;
import org.apache.cloudstack.api.response.GuestOSResponse;
import org.apache.cloudstack.api.response.HostResponse;
import org.apache.cloudstack.api.response.HypervisorCapabilitiesResponse;
import org.apache.cloudstack.api.response.ControlledViewEntityResponse;
import org.apache.cloudstack.api.response.IPAddressResponse;
import org.apache.cloudstack.api.response.InstanceGroupResponse;
import org.apache.cloudstack.api.response.IpForwardingRuleResponse;
import org.apache.cloudstack.api.response.LBStickinessPolicyResponse;
import org.apache.cloudstack.api.response.LBStickinessResponse;
import org.apache.cloudstack.api.response.LDAPConfigResponse;
import org.apache.cloudstack.api.response.LoadBalancerResponse;
import org.apache.cloudstack.api.response.NetworkACLResponse;
import org.apache.cloudstack.api.response.NetworkOfferingResponse;
import org.apache.cloudstack.api.response.NetworkResponse;
import org.apache.cloudstack.api.response.PhysicalNetworkResponse;
import org.apache.cloudstack.api.response.PodResponse;
import org.apache.cloudstack.api.response.PrivateGatewayResponse;
import org.apache.cloudstack.api.response.ProjectAccountResponse;
import org.apache.cloudstack.api.response.ProjectInvitationResponse;
import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.ProviderResponse;
import org.apache.cloudstack.api.response.RemoteAccessVpnResponse;
import org.apache.cloudstack.api.response.ResourceCountResponse;
import org.apache.cloudstack.api.response.ResourceLimitResponse;
import org.apache.cloudstack.api.response.ResourceTagResponse;
import org.apache.cloudstack.api.response.SecurityGroupResponse;
import org.apache.cloudstack.api.response.SecurityGroupRuleResponse;
import org.apache.cloudstack.api.response.ServiceOfferingResponse;
import org.apache.cloudstack.api.response.ServiceResponse;
import org.apache.cloudstack.api.response.Site2SiteCustomerGatewayResponse;
import org.apache.cloudstack.api.response.Site2SiteVpnConnectionResponse;
import org.apache.cloudstack.api.response.Site2SiteVpnGatewayResponse;
import org.apache.cloudstack.api.response.SnapshotPolicyResponse;
import org.apache.cloudstack.api.response.SnapshotResponse;
import org.apache.cloudstack.api.response.SnapshotScheduleResponse;
import org.apache.cloudstack.api.response.StaticRouteResponse;
import org.apache.cloudstack.api.response.StorageNetworkIpRangeResponse;
import org.apache.cloudstack.api.response.StoragePoolResponse;
import org.apache.cloudstack.api.response.SwiftResponse;
import org.apache.cloudstack.api.response.SystemVmInstanceResponse;
import org.apache.cloudstack.api.response.SystemVmResponse;
import org.apache.cloudstack.api.response.TemplatePermissionsResponse;
import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.TrafficTypeResponse;
import org.apache.cloudstack.api.response.UserResponse;
import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.api.response.VirtualRouterProviderResponse;
import org.apache.cloudstack.api.response.VlanIpRangeResponse;
import org.apache.cloudstack.api.response.VolumeResponse;
import org.apache.cloudstack.api.response.VpcOfferingResponse;
import org.apache.cloudstack.api.response.VpcResponse;
import org.apache.cloudstack.api.response.VpnUsersResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.api.response.S3Response;
import org.springframework.stereotype.Component;
<<<<<<<
import com.cloud.network.IpAddress;
import com.cloud.network.Network;
=======
import com.cloud.network.*;
>>>>>>>
import com.cloud.network.IpAddress;
import com.cloud.network.Network;
<<<<<<<
import com.cloud.network.NetworkProfile;
=======
>>>>>>>
import com.cloud.network.NetworkProfile;
<<<<<<<
import com.cloud.network.PhysicalNetwork;
import com.cloud.network.PhysicalNetworkServiceProvider;
import com.cloud.network.PhysicalNetworkTrafficType;
import com.cloud.network.RemoteAccessVpn;
import com.cloud.network.Site2SiteCustomerGateway;
import com.cloud.network.Site2SiteVpnConnection;
import com.cloud.network.Site2SiteVpnGateway;
import com.cloud.network.VirtualRouterProvider;
import com.cloud.network.VpnUser;
import com.cloud.network.as.AutoScalePolicy;
import com.cloud.network.as.AutoScaleVmGroup;
import com.cloud.network.as.AutoScaleVmProfile;
import com.cloud.network.as.AutoScaleVmProfileVO;
import com.cloud.network.as.Condition;
import com.cloud.network.as.ConditionVO;
import com.cloud.network.as.Counter;
import com.cloud.network.dao.IPAddressVO;
import com.cloud.network.dao.NetworkVO;
import com.cloud.network.dao.PhysicalNetworkVO;
=======
import com.cloud.network.as.*;
>>>>>>>
import com.cloud.network.PhysicalNetwork;
import com.cloud.network.PhysicalNetworkServiceProvider;
import com.cloud.network.PhysicalNetworkTrafficType;
import com.cloud.network.RemoteAccessVpn;
import com.cloud.network.Site2SiteCustomerGateway;
import com.cloud.network.Site2SiteVpnConnection;
import com.cloud.network.Site2SiteVpnGateway;
import com.cloud.network.VirtualRouterProvider;
import com.cloud.network.VpnUser;
import com.cloud.network.as.AutoScalePolicy;
import com.cloud.network.as.AutoScaleVmGroup;
import com.cloud.network.as.AutoScaleVmProfile;
import com.cloud.network.as.AutoScaleVmProfileVO;
import com.cloud.network.as.Condition;
import com.cloud.network.as.ConditionVO;
import com.cloud.network.as.Counter;
import com.cloud.network.dao.IPAddressVO;
import com.cloud.network.dao.NetworkVO;
import com.cloud.network.dao.PhysicalNetworkVO; |
<<<<<<<
addDao("IdentityDao", IdentityDaoImpl.class);
addDao("AccountDetailsDao", AccountDetailsDaoImpl.class);
=======
addDao("NetworkOfferingServiceMapDao", NetworkOfferingServiceMapDaoImpl.class);
>>>>>>>
addDao("IdentityDao", IdentityDaoImpl.class);
addDao("AccountDetailsDao", AccountDetailsDaoImpl.class);
addDao("NetworkOfferingServiceMapDao", NetworkOfferingServiceMapDaoImpl.class); |
<<<<<<<
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef.diskProtocol;
import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.DiskDef.diskCacheMode;
=======
>>>>>>>
<<<<<<<
def.defNetworkBasedDisk(diskPath, host, port, authUserName, poolUuid, diskLabel,
DiskDef.diskBus.valueOf(bus.toUpperCase()),
DiskDef.diskProtocol.valueOf(protocol.toUpperCase()));
def.setCacheMode(DiskDef.diskCacheMode.valueOf(diskCacheMode));
=======
def.defNetworkBasedDisk(diskPath, host, port, authUserName, poolUuid, diskLabel, DiskDef.diskBus.valueOf(bus.toUpperCase()),
DiskDef.diskProtocol.valueOf(protocol.toUpperCase()));
>>>>>>>
def.defNetworkBasedDisk(diskPath, host, port, authUserName, poolUuid, diskLabel,
DiskDef.diskBus.valueOf(bus.toUpperCase()),
DiskDef.diskProtocol.valueOf(protocol.toUpperCase()));
def.setCacheMode(DiskDef.diskCacheMode.valueOf(diskCacheMode));
<<<<<<<
def.defBlockBasedDisk(diskDev, diskLabel,
DiskDef.diskBus.valueOf(bus.toUpperCase()));
def.setCacheMode(DiskDef.diskCacheMode.valueOf(diskCacheMode));
=======
def.defBlockBasedDisk(diskDev, diskLabel, DiskDef.diskBus.valueOf(bus.toUpperCase()));
>>>>>>>
def.defBlockBasedDisk(diskDev, diskLabel,
DiskDef.diskBus.valueOf(bus.toUpperCase()));
def.setCacheMode(DiskDef.diskCacheMode.valueOf(diskCacheMode)); |
<<<<<<<
import org.apache.cloudstack.acl.AclEntityType;
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.api.ACL;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
=======
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
>>>>>>>
import org.apache.cloudstack.acl.AclEntityType;
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.api.ACL;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
<<<<<<<
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
=======
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
>>>>>>>
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ResponseObject.ResponseView;
import org.apache.cloudstack.api.ServerApiException;
<<<<<<<
@APICommand(name = "removeNicFromVirtualMachine", description = "Removes VM from specified network by deleting a NIC", responseObject = UserVmResponse.class, responseView = ResponseView.Restricted, entityType = { AclEntityType.VirtualMachine })
=======
@APICommand(name = "removeNicFromVirtualMachine", description = "Removes VM from specified network by deleting a NIC", responseObject = UserVmResponse.class)
>>>>>>>
@APICommand(name = "removeNicFromVirtualMachine", description = "Removes VM from specified network by deleting a NIC", responseObject = UserVmResponse.class, responseView = ResponseView.Restricted, entityType = { AclEntityType.VirtualMachine })
<<<<<<<
@ACL(accessType = AccessType.OperateEntry)
@Parameter(name=ApiConstants.VIRTUAL_MACHINE_ID, type=CommandType.UUID, entityType=UserVmResponse.class,
required=true, description="Virtual Machine ID")
=======
@Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, entityType = UserVmResponse.class, required = true, description = "Virtual Machine ID")
>>>>>>>
@ACL(accessType = AccessType.OperateEntry)
@Parameter(name=ApiConstants.VIRTUAL_MACHINE_ID, type=CommandType.UUID, entityType=UserVmResponse.class,
required=true, description="Virtual Machine ID")
<<<<<<<
=======
>>>>>>>
<<<<<<<
if (result != null){
UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Restricted, "virtualmachine", details, result).get(0);
=======
if (result != null) {
UserVmResponse response = _responseGenerator.createUserVmResponse("virtualmachine", details, result).get(0);
>>>>>>>
if (result != null){
UserVmResponse response = _responseGenerator.createUserVmResponse(ResponseView.Restricted, "virtualmachine", details, result).get(0); |
<<<<<<<
import org.apache.cloudstack.api.command.user.zone.ListZonesCmd;
=======
import org.apache.cloudstack.api.command.user.vpn.UpdateVpnGatewayCmd;
import org.apache.cloudstack.api.command.user.zone.ListZonesByCmd;
>>>>>>>
import org.apache.cloudstack.api.command.user.vpn.UpdateVpnGatewayCmd;
import org.apache.cloudstack.api.command.user.zone.ListZonesCmd; |
<<<<<<<
@Override
public AclEntityType getEntityType() {
return AclEntityType.Site2SiteVpnConnection;
}
=======
public void setUuid(String uuid) {
this.uuid = uuid;
}
>>>>>>>
public void setUuid(String uuid) {
this.uuid = uuid;
}
@Override
public AclEntityType getEntityType() {
return AclEntityType.Site2SiteVpnConnection;
} |
<<<<<<<
@Override
public AclEntityType getEntityType() {
return AclEntityType.AutoScaleVmGroup;
}
=======
public void setUuid(String uuid) {
this.uuid = uuid;
}
>>>>>>>
public void setUuid(String uuid) {
this.uuid = uuid;
}
@Override
public AclEntityType getEntityType() {
return AclEntityType.AutoScaleVmGroup;
} |
<<<<<<<
import org.apache.log4j.Logger;
import org.apache.cloudstack.acl.IAMEntityType;
=======
import org.apache.cloudstack.acl.RoleType;
>>>>>>>
import org.apache.log4j.Logger;
import org.apache.cloudstack.acl.IAMEntityType;
import org.apache.cloudstack.acl.RoleType;
<<<<<<<
@APICommand(name = "listRemoteAccessVpns", description = "Lists remote access vpns", responseObject = RemoteAccessVpnResponse.class, entityType = { IAMEntityType.RemoteAccessVpn })
=======
@APICommand(name = "listRemoteAccessVpns", description = "Lists remote access vpns", responseObject = RemoteAccessVpnResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
>>>>>>>
@APICommand(name = "listRemoteAccessVpns", description = "Lists remote access vpns", responseObject = RemoteAccessVpnResponse.class, entityType = { IAMEntityType.RemoteAccessVpn },
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) |
<<<<<<<
@SerializedName(ApiConstants.IS_DYNAMICALLY_SCALABLE) @Param(description="true if template contains XS/VMWare tools inorder to support dynamic scaling of VM cpu/memory")
private Boolean isDynamicallyScalable;
=======
public TemplateResponse(){
zones = new LinkedHashSet<TemplateZoneResponse>();
tags = new LinkedHashSet<ResourceTagResponse>();
}
>>>>>>>
@SerializedName(ApiConstants.IS_DYNAMICALLY_SCALABLE) @Param(description="true if template contains XS/VMWare tools inorder to support dynamic scaling of VM cpu/memory")
private Boolean isDynamicallyScalable;
public TemplateResponse(){
zones = new LinkedHashSet<TemplateZoneResponse>();
tags = new LinkedHashSet<ResourceTagResponse>();
}
<<<<<<<
public void setDynamicallyScalable(boolean isDynamicallyScalable) {
this.isDynamicallyScalable = isDynamicallyScalable;
}
=======
public String getZoneId() {
return zoneId;
}
>>>>>>>
public void setDynamicallyScalable(boolean isDynamicallyScalable) {
this.isDynamicallyScalable = isDynamicallyScalable;
}
public String getZoneId() {
return zoneId;
} |
<<<<<<<
import org.apache.log4j.Logger;
import org.apache.cloudstack.acl.IAMEntityType;
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.api.ACL;
=======
import org.apache.cloudstack.acl.RoleType;
>>>>>>>
import org.apache.log4j.Logger;
import org.apache.cloudstack.acl.IAMEntityType;
import org.apache.cloudstack.acl.RoleType;
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.api.ACL;
<<<<<<<
@APICommand(name = "updateNetwork", description = "Updates a network", responseObject = NetworkResponse.class, responseView = ResponseView.Restricted, entityType = { IAMEntityType.Network })
=======
@APICommand(name = "updateNetwork", description = "Updates a network", responseObject = NetworkResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
>>>>>>>
@APICommand(name = "updateNetwork", description = "Updates a network", responseObject = NetworkResponse.class, responseView = ResponseView.Restricted, entityType = {IAMEntityType.Network},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) |
<<<<<<<
state.getBlock().onBlockActivated(actor.world, this.pos, state, actor.fakePlayer, EnumHand.MAIN_HAND, null, this.pos.getX(), this.pos.getY(), this.pos.getZ());
=======
state.getBlock().onBlockActivated(actor.worldObj, this.pos, state, player, EnumHand.MAIN_HAND, actor.getHeldItemMainhand(), EnumFacing.UP, this.pos.getX(), this.pos.getY(), this.pos.getZ());
>>>>>>>
state.getBlock().onBlockActivated(actor.world, this.pos, state, player, EnumHand.MAIN_HAND, null, this.pos.getX(), this.pos.getY(), this.pos.getZ()); |
<<<<<<<
import mchorse.blockbuster.utils.TextureLocation;
import mchorse.mclib.client.gui.utils.GuiUtils;
=======
import mchorse.blockbuster_pack.client.render.layers.LayerBodyPart;
import mchorse.blockbuster_pack.client.render.part.IBodyPart;
import mchorse.blockbuster_pack.client.render.part.MorphBodyPart;
>>>>>>>
import mchorse.blockbuster.utils.TextureLocation;
import mchorse.blockbuster_pack.client.render.layers.LayerBodyPart;
import mchorse.blockbuster_pack.client.render.part.IBodyPart;
import mchorse.blockbuster_pack.client.render.part.MorphBodyPart; |
<<<<<<<
import org.apache.log4j.Logger;
import org.apache.cloudstack.acl.IAMEntityType;
=======
>>>>>>>
import org.apache.log4j.Logger;
import org.apache.cloudstack.acl.IAMEntityType;
<<<<<<<
@APICommand(name = "listEgressFirewallRules", description = "Lists all egress firewall rules for network id.", responseObject = FirewallResponse.class, entityType = { IAMEntityType.FirewallRule })
=======
@APICommand(name = "listEgressFirewallRules", description = "Lists all egress firewall rules for network id.", responseObject = FirewallResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
>>>>>>>
@APICommand(name = "listEgressFirewallRules", description = "Lists all egress firewall rules for network id.", responseObject = FirewallResponse.class, entityType = { IAMEntityType.FirewallRule },
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) |
<<<<<<<
=======
import java.util.Map;
>>>>>>>
<<<<<<<
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ResponseObject;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.UserVmResponse;
=======
import com.cloud.api.BaseCmd;
import com.cloud.api.ServerApiException;
>>>>>>>
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ResponseObject;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.UserVmResponse;
<<<<<<<
import com.cloud.offering.ServiceOffering;
=======
import com.cloud.domain.DomainVO;
import com.cloud.host.HostVO;
import com.cloud.server.Criteria;
import com.cloud.service.ServiceOfferingVO;
import com.cloud.storage.GuestOSVO;
import com.cloud.storage.StoragePoolVO;
>>>>>>>
import com.cloud.offering.ServiceOffering;
<<<<<<<
import com.cloud.user.UserContext;
import com.cloud.vm.UserVmVO;
=======
import com.cloud.uservm.UserVm;
import com.cloud.utils.Pair;
import com.cloud.vm.InstanceGroupVO;
>>>>>>>
import com.cloud.user.UserContext;
import com.cloud.vm.InstanceGroupVO;
import com.cloud.vm.UserVmVO;
<<<<<<<
=======
private static final List<Pair<Enum, Boolean>> s_properties = new ArrayList<Pair<Enum, Boolean>>();
static {
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.ID, Boolean.FALSE));
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.NAME, Boolean.FALSE));
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.STATE, Boolean.FALSE));
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.ZONE_ID, Boolean.FALSE));
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.POD_ID, Boolean.FALSE));
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.GROUP_ID, Boolean.FALSE));
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.HOST_ID, Boolean.FALSE));
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.KEYWORD, Boolean.FALSE));
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.ACCOUNT, Boolean.FALSE));
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.DOMAIN_ID, Boolean.FALSE));
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.ACCOUNT_OBJ, Boolean.FALSE));
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.PAGE, Boolean.FALSE));
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.PAGESIZE, Boolean.FALSE));
}
>>>>>>>
<<<<<<<
public Long getDomainId() {
return domainId;
}
=======
@Override
public List<Pair<String, Object>> execute(Map<String, Object> params) {
Long id = (Long)params.get(BaseCmd.Properties.ID.getName());
Account account = (Account)params.get(BaseCmd.Properties.ACCOUNT_OBJ.getName());
String accountName = (String)params.get(BaseCmd.Properties.ACCOUNT.getName());
Long domainId = (Long)params.get(BaseCmd.Properties.DOMAIN_ID.getName());
String name = (String) params.get(BaseCmd.Properties.NAME.getName());
String state = (String) params.get(BaseCmd.Properties.STATE.getName());
Long zoneId = (Long)params.get(BaseCmd.Properties.ZONE_ID.getName());
Long podId = (Long)params.get(BaseCmd.Properties.POD_ID.getName());
Long hostId = (Long)params.get(BaseCmd.Properties.HOST_ID.getName());
Long groupId = (Long)params.get(BaseCmd.Properties.GROUP_ID.getName());
String keyword = (String)params.get(BaseCmd.Properties.KEYWORD.getName());
Integer page = (Integer)params.get(BaseCmd.Properties.PAGE.getName());
Integer pageSize = (Integer)params.get(BaseCmd.Properties.PAGESIZE.getName());
Long accountId = null;
Boolean isAdmin = false;
if ((account == null) || isAdmin(account.getType())) {
isAdmin = true;
if (domainId != null) {
if ((account != null) && !getManagementServer().isChildDomain(account.getDomainId(), domainId)) {
throw new ServerApiException(BaseCmd.PARAM_ERROR, "Invalid domain id (" + domainId + ") given, unable to list virtual machines.");
}
>>>>>>>
public Long getDomainId() {
return domainId;
}
<<<<<<<
public Long getId() {
return id;
}
=======
if(account!=null && domainId==null){
throw new ServerApiException(BaseCmd.ACCOUNT_ERROR, "Please specify the domain id for this account:"+account.getId());
}
Long[] accountIds = null;
if (accountId != null) {
accountIds = new Long[1];
accountIds[0] = accountId;
}
>>>>>>>
public Long getId() {
return id;
}
<<<<<<<
public Long getPodId() {
return podId;
}
=======
c.addCriteria(Criteria.ACCOUNTID, accountIds);
c.addCriteria(Criteria.ISADMIN, isAdmin);
c.addCriteria(Criteria.GROUPID, groupId);
>>>>>>>
public Long getPodId() {
return podId;
}
<<<<<<<
public Long getZoneId() {
return zoneId;
}
/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
=======
if (virtualMachines == null) {
throw new ServerApiException(BaseCmd.VM_LIST_ERROR, "unable to find virtual machines for account id " + accountName.toString());
}
Object[] vmTag = new Object[virtualMachines.size()];
int i = 0;
>>>>>>>
public Long getZoneId() {
return zoneId;
}
/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
<<<<<<<
@Override @SuppressWarnings("unchecked")
public ResponseObject getResponse() {
List<UserVmVO> userVms = (List<UserVmVO>)getResponseObject();
ListResponse response = new ListResponse();
List<UserVmResponse> vmResponses = new ArrayList<UserVmResponse>();
for (UserVmVO userVm : userVms) {
UserVmResponse userVmResponse = new UserVmResponse();
userVmResponse.setId(userVm.getId());
AsyncJobVO asyncJob = ApiDBUtils.findInstancePendingAsyncJob("vm_instance", userVm.getId());
if (asyncJob != null) {
userVmResponse.setJobId(asyncJob.getId());
userVmResponse.setJobStatus(asyncJob.getStatus());
=======
for (UserVm vmInstance : virtualMachines) {
//if the account is deleted, do not return the user vm
Account currentVmAccount = getManagementServer().getAccount(vmInstance.getAccountId());
if(currentVmAccount.getRemoved()!=null)
{
continue; //not returning this vm
}
List<Pair<String, Object>> vmData = new ArrayList<Pair<String, Object>>();
AsyncJobVO asyncJob = getManagementServer().findInstancePendingAsyncJob("vm_instance", vmInstance.getId());
if(asyncJob != null) {
vmData.add(new Pair<String, Object>(BaseCmd.Properties.JOB_ID.getName(), asyncJob.getId().toString()));
vmData.add(new Pair<String, Object>(BaseCmd.Properties.JOB_STATUS.getName(), String.valueOf(asyncJob.getStatus())));
>>>>>>>
@Override @SuppressWarnings("unchecked")
public ResponseObject getResponse() {
List<UserVmVO> userVms = (List<UserVmVO>)getResponseObject();
ListResponse response = new ListResponse();
List<UserVmResponse> vmResponses = new ArrayList<UserVmResponse>();
for (UserVmVO userVm : userVms) {
UserVmResponse userVmResponse = new UserVmResponse();
userVmResponse.setId(userVm.getId());
AsyncJobVO asyncJob = ApiDBUtils.findInstancePendingAsyncJob("vm_instance", userVm.getId());
if (asyncJob != null) {
userVmResponse.setJobId(asyncJob.getId());
userVmResponse.setJobStatus(asyncJob.getStatus());
<<<<<<<
userVmResponse.setName(userVm.getName());
userVmResponse.setCreated(userVm.getCreated());
userVmResponse.setPrivateIp(userVm.getPrivateIpAddress());
if (userVm.getState() != null) {
userVmResponse.setState(userVm.getState().toString());
=======
vmData.add(new Pair<String, Object>(BaseCmd.Properties.ID.getName(), Long.toString(vmInstance.getId())));
vmData.add(new Pair<String, Object>(BaseCmd.Properties.NAME.getName(), vmInstance.getName()));
vmData.add(new Pair<String, Object>(BaseCmd.Properties.CREATED.getName(), getDateString(vmInstance.getCreated())));
vmData.add(new Pair<String, Object>(BaseCmd.Properties.IP_ADDRESS.getName(), vmInstance.getPrivateIpAddress()));
if (vmInstance.getState() != null) {
vmData.add(new Pair<String, Object>(BaseCmd.Properties.STATE.getName(), vmInstance.getState().toString()));
>>>>>>>
userVmResponse.setName(userVm.getName());
userVmResponse.setCreated(userVm.getCreated());
userVmResponse.setPrivateIp(userVm.getPrivateIpAddress());
if (userVm.getState() != null) {
userVmResponse.setState(userVm.getState().toString());
<<<<<<<
userVmResponse.setAccountName(acct.getAccountName());
userVmResponse.setDomainId(acct.getDomainId());
userVmResponse.setDomainName(ApiDBUtils.findDomainById(acct.getDomainId()).getName());
=======
vmData.add(new Pair<String, Object>(BaseCmd.Properties.ACCOUNT.getName(), acct.getAccountName()));
vmData.add(new Pair<String, Object>(BaseCmd.Properties.DOMAIN_ID.getName(), Long.toString(acct.getDomainId())));
vmData.add(new Pair<String, Object>(BaseCmd.Properties.DOMAIN.getName(), getManagementServer().findDomainIdById(acct.getDomainId()).getName()));
>>>>>>>
userVmResponse.setAccountName(acct.getAccountName());
userVmResponse.setDomainId(acct.getDomainId());
userVmResponse.setDomainName(ApiDBUtils.findDomainById(acct.getDomainId()).getName());
<<<<<<<
userVmResponse.setGroup(userVm.getGroup());
=======
//Groups
InstanceGroupVO group = getManagementServer().getGroupForVm(vmInstance.getId());
if (group != null) {
vmData.add(new Pair<String, Object>(BaseCmd.Properties.GROUP_ID.getName(), group.getId()));
vmData.add(new Pair<String, Object>(BaseCmd.Properties.GROUP.getName(), group.getName()));
}
>>>>>>>
InstanceGroupVO group = ApiDBUtils.findInstanceGroupForVM(userVm.getId());
if (group != null) {
userVmResponse.setGroup(group.getName());
userVmResponse.setGroupId(group.getId());
}
<<<<<<<
userVmResponse.setNetworkGroupList(ApiDBUtils.getNetworkGroupsNamesForVm(userVm.getId()));
userVmResponse.setResponseName("virtualmachine");
vmResponses.add(userVmResponse);
=======
vmData.add(new Pair<String, Object>(BaseCmd.Properties.NETWORK_GROUP_LIST.getName(), getManagementServer().getNetworkGroupsNamesForVm(vmInstance.getId())));
//root device related
VolumeVO rootVolume = getManagementServer().findRootVolume(vmInstance.getId());
if(rootVolume!=null)
{
vmData.add(new Pair<String, Object>(BaseCmd.Properties.ROOT_DEVICE_ID.getName(), rootVolume.getDeviceId()));
StoragePoolVO storagePool = getManagementServer().findPoolById(rootVolume.getPoolId());
vmData.add(new Pair<String, Object>(BaseCmd.Properties.ROOT_DEVICE_TYPE.getName(), storagePool.getPoolType().toString()));
}
vmTag[i++] = vmData;
>>>>>>>
userVmResponse.setNetworkGroupList(ApiDBUtils.getNetworkGroupsNamesForVm(userVm.getId()));
userVmResponse.setResponseName("virtualmachine");
vmResponses.add(userVmResponse); |
<<<<<<<
@Inject
AccountService _accountService;
=======
>>>>>>>
@Inject
AccountService _accountService;
<<<<<<<
if (_accountService.isNormalUser(caller.getId())) {
=======
if (caller.getType() == Account.ACCOUNT_TYPE_NORMAL) {
>>>>>>>
if (_accountService.isNormalUser(caller.getId())) {
<<<<<<<
//admin has all permissions
if (_accountService.isRootAdmin(account.getId())) {
return true;
}
//if account is normal user or domain admin
//check if account's domain is a child of zone's domain (Note: This is made consistent with the list command for disk offering)
else if (_accountService.isNormalUser(account.getId())
|| account.getType() == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN
|| _accountService.isDomainAdmin(account.getId())) {
=======
//admin has all permissions
if (account.getType() == Account.ACCOUNT_TYPE_ADMIN) {
return true;
}
//if account is normal user or domain admin
//check if account's domain is a child of zone's domain (Note: This is made consistent with the list command for disk offering)
else if (account.getType() == Account.ACCOUNT_TYPE_NORMAL || account.getType() == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN ||
account.getType() == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) {
>>>>>>>
//admin has all permissions
if (_accountService.isRootAdmin(account.getId())) {
return true;
}
//if account is normal user or domain admin
//check if account's domain is a child of zone's domain (Note: This is made consistent with the list command for disk offering)
else if (_accountService.isNormalUser(account.getId())
|| account.getType() == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN
|| _accountService.isDomainAdmin(account.getId())) {
<<<<<<<
//admin has all permissions
if (_accountService.isRootAdmin(account.getId())) {
return true;
}
//if account is normal user or domain admin
//check if account's domain is a child of zone's domain (Note: This is made consistent with the list command for service offering)
else if (_accountService.isNormalUser(account.getId())
|| account.getType() == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN
|| _accountService.isDomainAdmin(account.getId())) {
=======
//admin has all permissions
if (account.getType() == Account.ACCOUNT_TYPE_ADMIN) {
return true;
}
//if account is normal user or domain admin
//check if account's domain is a child of zone's domain (Note: This is made consistent with the list command for service offering)
else if (account.getType() == Account.ACCOUNT_TYPE_NORMAL || account.getType() == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN ||
account.getType() == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) {
>>>>>>>
//admin has all permissions
if (_accountService.isRootAdmin(account.getId())) {
return true;
}
//if account is normal user or domain admin
//check if account's domain is a child of zone's domain (Note: This is made consistent with the list command for service offering)
else if (_accountService.isNormalUser(account.getId())
|| account.getType() == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN
|| _accountService.isDomainAdmin(account.getId())) {
<<<<<<<
//admin has all permissions
if (_accountService.isRootAdmin(account.getId())) {
return true;
}
//if account is normal user
//check if account's domain is a child of zone's domain
else if (_accountService.isNormalUser(account.getId()) || account.getType() == Account.ACCOUNT_TYPE_PROJECT) {
=======
//admin has all permissions
if (account.getType() == Account.ACCOUNT_TYPE_ADMIN) {
return true;
}
//if account is normal user
//check if account's domain is a child of zone's domain
else if (account.getType() == Account.ACCOUNT_TYPE_NORMAL || account.getType() == Account.ACCOUNT_TYPE_PROJECT) {
>>>>>>>
//admin has all permissions
if (_accountService.isRootAdmin(account.getId())) {
return true;
}
//if account is normal user
//check if account's domain is a child of zone's domain
else if (_accountService.isNormalUser(account.getId()) || account.getType() == Account.ACCOUNT_TYPE_PROJECT) {
<<<<<<<
}
}
}
//not found
return false;
}
//if account is domain admin
//check if the account's domain is either child of zone's domain, or if zone's domain is child of account's domain
else if (_accountService.isDomainAdmin(account.getId())) {
=======
}
}
}
//not found
return false;
}
//if account is domain admin
//check if the account's domain is either child of zone's domain, or if zone's domain is child of account's domain
else if (account.getType() == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) {
>>>>>>>
}
}
}
//not found
return false;
}
//if account is domain admin
//check if the account's domain is either child of zone's domain, or if zone's domain is child of account's domain
else if (_accountService.isDomainAdmin(account.getId())) {
<<<<<<<
return true;
}
}
//not found
return false;
}
}
return false;
}
@Override
public boolean checkAccess(Account caller, ControlledEntity entity, AccessType accessType, String action)
throws PermissionDeniedException {
return checkAccess(caller, entity, accessType);
}
=======
return true;
}
}
//not found
return false;
}
}
return false;
}
>>>>>>>
return true;
}
}
//not found
return false;
}
}
return false;
}
@Override
public boolean checkAccess(Account caller, ControlledEntity entity, AccessType accessType, String action)
throws PermissionDeniedException {
return checkAccess(caller, entity, accessType);
} |
<<<<<<<
import com.cloud.projects.Project;
import com.cloud.projects.ProjectManager;
=======
import com.cloud.resource.ResourceManager;
>>>>>>>
import com.cloud.projects.Project;
import com.cloud.projects.ProjectManager;
import com.cloud.resource.ResourceManager;
<<<<<<<
@Inject
private ProjectManager _projectMgr;
=======
@Inject
private SecondaryStorageVmManager _ssvmMgr;
@Inject
private ResourceManager _resourceMgr;
>>>>>>>
@Inject
private ProjectManager _projectMgr;
@Inject
private SecondaryStorageVmManager _ssvmMgr;
@Inject
private ResourceManager _resourceMgr; |
<<<<<<<
=======
import com.cloud.utils.component.Adapters;
import com.cloud.utils.component.ComponentLocator;
import com.cloud.utils.component.Inject;
>>>>>>> |
<<<<<<<
if (volIso != null) {
TemplateObjectTO iso = (TemplateObjectTO)volIso.getData();
if (iso.getPath() != null && !iso.getPath().isEmpty()) {
DataStoreTO imageStore = iso.getDataStore();
if (!(imageStore instanceof NfsTO)) {
s_logger.debug("unsupported protocol");
throw new Exception("unsupported protocol");
}
NfsTO nfsImageStore = (NfsTO)imageStore;
String isoPath = nfsImageStore.getUrl() + File.separator + iso.getPath();
Pair<String, ManagedObjectReference> isoDatastoreInfo = getIsoDatastoreInfo(hyperHost, isoPath);
assert (isoDatastoreInfo != null);
assert (isoDatastoreInfo.second() != null);
deviceConfigSpecArray[i] = new VirtualDeviceConfigSpec();
Pair<VirtualDevice, Boolean> isoInfo = VmwareHelper.prepareIsoDevice(vmMo, isoDatastoreInfo.first(), isoDatastoreInfo.second(), true, true, i, i + 1);
deviceConfigSpecArray[i].setDevice(isoInfo.first());
if (isoInfo.second()) {
if(s_logger.isDebugEnabled())
s_logger.debug("Prepare ISO volume at new device " + _gson.toJson(isoInfo.first()));
deviceConfigSpecArray[i].setOperation(VirtualDeviceConfigSpecOperation.ADD);
} else {
if(s_logger.isDebugEnabled())
s_logger.debug("Prepare ISO volume at existing device " + _gson.toJson(isoInfo.first()));
deviceConfigSpecArray[i].setOperation(VirtualDeviceConfigSpecOperation.EDIT);
}
}
=======
if (volIso != null && volIso.getPath() != null && !volIso.getPath().isEmpty()) {
Pair<String, ManagedObjectReference> isoDatastoreInfo = getIsoDatastoreInfo(hyperHost, volIso.getPath());
assert (isoDatastoreInfo != null);
assert (isoDatastoreInfo.second() != null);
deviceConfigSpecArray[i] = new VirtualDeviceConfigSpec();
Pair<VirtualDevice, Boolean> isoInfo = VmwareHelper.prepareIsoDevice(vmMo, isoDatastoreInfo.first(), isoDatastoreInfo.second(), true, true, ideUnitNumber++, i + 1);
deviceConfigSpecArray[i].setDevice(isoInfo.first());
if (isoInfo.second()) {
if(s_logger.isDebugEnabled())
s_logger.debug("Prepare ISO volume at new device " + _gson.toJson(isoInfo.first()));
deviceConfigSpecArray[i].setOperation(VirtualDeviceConfigSpecOperation.ADD);
} else {
if(s_logger.isDebugEnabled())
s_logger.debug("Prepare ISO volume at existing device " + _gson.toJson(isoInfo.first()));
deviceConfigSpecArray[i].setOperation(VirtualDeviceConfigSpecOperation.EDIT);
}
>>>>>>>
if (volIso != null) {
TemplateObjectTO iso = (TemplateObjectTO)volIso.getData();
if (iso.getPath() != null && !iso.getPath().isEmpty()) {
DataStoreTO imageStore = iso.getDataStore();
if (!(imageStore instanceof NfsTO)) {
s_logger.debug("unsupported protocol");
throw new Exception("unsupported protocol");
}
NfsTO nfsImageStore = (NfsTO)imageStore;
String isoPath = nfsImageStore.getUrl() + File.separator + iso.getPath();
Pair<String, ManagedObjectReference> isoDatastoreInfo = getIsoDatastoreInfo(hyperHost, isoPath);
assert (isoDatastoreInfo != null);
assert (isoDatastoreInfo.second() != null);
deviceConfigSpecArray[i] = new VirtualDeviceConfigSpec();
Pair<VirtualDevice, Boolean> isoInfo = VmwareHelper.prepareIsoDevice(vmMo, isoDatastoreInfo.first(), isoDatastoreInfo.second(), true, true, ideUnitNumber++, i + 1);
deviceConfigSpecArray[i].setDevice(isoInfo.first());
if (isoInfo.second()) {
if(s_logger.isDebugEnabled())
s_logger.debug("Prepare ISO volume at new device " + _gson.toJson(isoInfo.first()));
deviceConfigSpecArray[i].setOperation(VirtualDeviceConfigSpecOperation.ADD);
} else {
if(s_logger.isDebugEnabled())
s_logger.debug("Prepare ISO volume at existing device " + _gson.toJson(isoInfo.first()));
deviceConfigSpecArray[i].setOperation(VirtualDeviceConfigSpecOperation.EDIT);
}
}
<<<<<<<
for (DiskTO vol : sortVolumesByDeviceId(disks)) {
=======
i++;
for (VolumeTO vol : sortVolumesByDeviceId(disks)) {
>>>>>>>
i++;
for (DiskTO vol : sortVolumesByDeviceId(disks)) {
<<<<<<<
datastoreDiskPath = String.format("[%s] %s.vmdk", volumeDsDetails.second().getName(), volumeTO.getPath());
String chainInfo = volumeTO.getChainInfo();
=======
datastoreDiskPath = volumeDsDetails.second().searchFileInSubFolders(vol.getPath() + ".vmdk", true);
String chainInfo = vol.getChainInfo();
>>>>>>>
datastoreDiskPath = String.format("[%s] %s.vmdk", volumeDsDetails.second().getName(), volumeTO.getPath());
String chainInfo = volumeTO.getChainInfo(); |
<<<<<<<
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import javax.ejb.Local;
import org.apache.log4j.Logger;
import org.apache.xmlrpc.XmlRpcException;
=======
>>>>>>>
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import javax.ejb.Local;
import org.apache.log4j.Logger;
import org.apache.xmlrpc.XmlRpcException;
<<<<<<<
=======
import org.apache.log4j.Logger;
import org.apache.xmlrpc.XmlRpcException;
import javax.ejb.Local;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
>>>>>>> |
<<<<<<<
=======
import mchorse.blockbuster.core.transformers.SimpleReloadableResourceManagerTransformer;
import mchorse.blockbuster.core.transformers.TileEntityItemStackRendererTransformer;
>>>>>>>
import mchorse.blockbuster.core.transformers.SimpleReloadableResourceManagerTransformer;
<<<<<<<
=======
private TileEntityItemStackRendererTransformer isr = new TileEntityItemStackRendererTransformer();
private SimpleReloadableResourceManagerTransformer resourcePack = new SimpleReloadableResourceManagerTransformer();
>>>>>>>
private SimpleReloadableResourceManagerTransformer resourcePack = new SimpleReloadableResourceManagerTransformer();
<<<<<<<
=======
else if (this.checkName(name, "bqc", "net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer"))
{
System.out.println("BBCoreMod: Transforming TEISR class (" + name + ")");
return this.isr.transform(name, basicClass);
}
else if (this.checkName(name, "cae", "net.minecraft.client.resources.SimpleReloadableResourceManager"))
{
System.out.println("BBCoreMod: Transforming SimpleReloadableResourceManager class (" + name + ")");
return this.resourcePack.transform(name, basicClass);
}
>>>>>>>
else if (this.checkName(name, "cep", "net.minecraft.client.resources.SimpleReloadableResourceManager"))
{
System.out.println("BBCoreMod: Transforming SimpleReloadableResourceManager class (" + name + ")");
return this.resourcePack.transform(name, basicClass);
} |
<<<<<<<
private static VpcManager _vpcMgr;
=======
private static TaggedResourceService _taggedResourceService;
>>>>>>>
private static VpcManager _vpcMgr;
private static TaggedResourceService _taggedResourceService;
<<<<<<<
_vpcMgr = locator.getManager(VpcManager.class);
=======
_taggedResourceService = locator.getManager(TaggedResourceService.class);
>>>>>>>
_vpcMgr = locator.getManager(VpcManager.class);
_taggedResourceService = locator.getManager(TaggedResourceService.class);
<<<<<<<
public static Map<Service, Set<Provider>> listVpcOffServices(long vpcOffId) {
return _vpcMgr.getVpcOffSvcProvidersMap(vpcOffId);
}
public static List<? extends Network> listVpcNetworks(long vpcId) {
return _networkMgr.listNetworksByVpc(vpcId);
}
=======
public static boolean canUseForDeploy(Network network) {
return _networkMgr.canUseForDeploy(network);
}
public static String getUuid(String resourceId, TaggedResourceType resourceType) {
return _taggedResourceService.getUuid(resourceId, resourceType);
}
>>>>>>>
public static Map<Service, Set<Provider>> listVpcOffServices(long vpcOffId) {
return _vpcMgr.getVpcOffSvcProvidersMap(vpcOffId);
}
public static List<? extends Network> listVpcNetworks(long vpcId) {
return _networkMgr.listNetworksByVpc(vpcId);
}
public static boolean canUseForDeploy(Network network) {
return _networkMgr.canUseForDeploy(network);
}
public static String getUuid(String resourceId, TaggedResourceType resourceType) {
return _taggedResourceService.getUuid(resourceId, resourceType);
} |
<<<<<<<
import org.apache.log4j.Logger;
import org.apache.cloudstack.acl.IAMEntityType;
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
=======
>>>>>>>
import org.apache.log4j.Logger;
import org.apache.cloudstack.acl.IAMEntityType;
import org.apache.cloudstack.acl.SecurityChecker.AccessType; |
<<<<<<<
public static BareMetalVmService _bareMetalVmService;
public static ProjectService _projectService;
=======
public static BareMetalVmService _bareMetalVmService;
>>>>>>>
public static BareMetalVmService _bareMetalVmService;
public static ProjectService _projectService;
<<<<<<<
}
public static boolean isRootAdmin(short accountType) {
return ((accountType == Account.ACCOUNT_TYPE_ADMIN));
}
=======
}
public void setFullUrlParams(Map<String, String> map) {
this.fullUrlParams = map;
}
public Map<String, String> getFullUrlParams() {
return this.fullUrlParams;
}
>>>>>>>
}
public static boolean isRootAdmin(short accountType) {
return ((accountType == Account.ACCOUNT_TYPE_ADMIN));
}
public void setFullUrlParams(Map<String, String> map) {
this.fullUrlParams = map;
}
public Map<String, String> getFullUrlParams() {
return this.fullUrlParams;
} |
<<<<<<<
actor.world.playSound((EntityPlayer) null, actor.posX, actor.posY, actor.posZ, SoundEvents.ENTITY_PLAYER_ATTACK_WEAK, actor.getSoundCategory(), 1.0F, 1.0F);
=======
if (Blockbuster.proxy.config.actor_swish_swipe)
{
actor.worldObj.playSound((EntityPlayer) null, actor.posX, actor.posY, actor.posZ, SoundEvents.ENTITY_PLAYER_ATTACK_WEAK, actor.getSoundCategory(), 1.0F, 1.0F);
}
>>>>>>>
if (Blockbuster.proxy.config.actor_swish_swipe)
{
actor.world.playSound((EntityPlayer) null, actor.posX, actor.posY, actor.posZ, SoundEvents.ENTITY_PLAYER_ATTACK_WEAK, actor.getSoundCategory(), 1.0F, 1.0F);
} |
<<<<<<<
import com.cloud.agent.api.AgentControlAnswer;
import com.cloud.agent.api.ConsoleAccessAuthenticationCommand;
import com.cloud.agent.api.ConsoleProxyLoadReportCommand;
import com.cloud.agent.api.StartupCommand;
import com.cloud.host.Host;
import com.cloud.host.Status;
import com.cloud.host.Host.Type;
import com.cloud.info.ConsoleProxyInfo;
=======
>>>>>>> |
<<<<<<<
import org.apache.cloudstack.api.response.TemplateResponse;
=======
import org.apache.cloudstack.api.response.StoragePoolForMigrationResponse;
>>>>>>>
import org.apache.cloudstack.api.response.TemplateResponse;
import org.apache.cloudstack.api.response.StoragePoolForMigrationResponse;
<<<<<<<
public static List<ImageStoreResponse> createImageStoreResponse(ImageStoreJoinVO... stores) {
Hashtable<Long, ImageStoreResponse> vrDataList = new Hashtable<Long, ImageStoreResponse>();
// Initialise the vrdatalist with the input data
for (ImageStoreJoinVO vr : stores) {
ImageStoreResponse vrData = vrDataList.get(vr.getId());
if ( vrData == null ){
// first time encountering this vm
vrData = ApiDBUtils.newImageStoreResponse(vr);
}
else{
// update tags
vrData = ApiDBUtils.fillImageStoreDetails(vrData, vr);
}
vrDataList.put(vr.getId(), vrData);
}
return new ArrayList<ImageStoreResponse>(vrDataList.values());
}
=======
public static List<StoragePoolForMigrationResponse> createStoragePoolForMigrationResponse(StoragePoolJoinVO... pools) {
Hashtable<Long, StoragePoolForMigrationResponse> vrDataList = new Hashtable<Long, StoragePoolForMigrationResponse>();
// Initialise the vrdatalist with the input data
for (StoragePoolJoinVO vr : pools) {
StoragePoolForMigrationResponse vrData = vrDataList.get(vr.getId());
if ( vrData == null ) {
// first time encountering this vm
vrData = ApiDBUtils.newStoragePoolForMigrationResponse(vr);
} else {
// update tags
vrData = ApiDBUtils.fillStoragePoolForMigrationDetails(vrData, vr);
}
vrDataList.put(vr.getId(), vrData);
}
return new ArrayList<StoragePoolForMigrationResponse>(vrDataList.values());
}
>>>>>>>
public static List<ImageStoreResponse> createImageStoreResponse(ImageStoreJoinVO... stores) {
Hashtable<Long, ImageStoreResponse> vrDataList = new Hashtable<Long, ImageStoreResponse>();
// Initialise the vrdatalist with the input data
for (ImageStoreJoinVO vr : stores) {
ImageStoreResponse vrData = vrDataList.get(vr.getId());
if ( vrData == null ){
// first time encountering this vm
vrData = ApiDBUtils.newImageStoreResponse(vr);
}
else{
// update tags
vrData = ApiDBUtils.fillImageStoreDetails(vrData, vr);
}
vrDataList.put(vr.getId(), vrData);
}
return new ArrayList<ImageStoreResponse>(vrDataList.values());
}
public static List<StoragePoolForMigrationResponse> createStoragePoolForMigrationResponse(StoragePoolJoinVO... pools) {
Hashtable<Long, StoragePoolForMigrationResponse> vrDataList = new Hashtable<Long, StoragePoolForMigrationResponse>();
// Initialise the vrdatalist with the input data
for (StoragePoolJoinVO vr : pools) {
StoragePoolForMigrationResponse vrData = vrDataList.get(vr.getId());
if ( vrData == null ) {
// first time encountering this vm
vrData = ApiDBUtils.newStoragePoolForMigrationResponse(vr);
} else {
// update tags
vrData = ApiDBUtils.fillStoragePoolForMigrationDetails(vrData, vr);
}
vrDataList.put(vr.getId(), vrData);
}
return new ArrayList<StoragePoolForMigrationResponse>(vrDataList.values());
}
<<<<<<<
public static List<TemplateResponse> createTemplateResponse(TemplateJoinVO... templates) {
Hashtable<Long, TemplateResponse> vrDataList = new Hashtable<Long, TemplateResponse>();
for (TemplateJoinVO vr : templates) {
TemplateResponse vrData = vrDataList.get(vr.getId());
if ( vrData == null ){
// first time encountering this volume
vrData = ApiDBUtils.newTemplateResponse(vr);
}
else{
// update tags
vrData = ApiDBUtils.fillTemplateDetails(vrData, vr);
}
vrDataList.put(vr.getId(), vrData);
}
return new ArrayList<TemplateResponse>(vrDataList.values());
}
public static List<TemplateResponse> createTemplateUpdateResponse(TemplateJoinVO... templates) {
Hashtable<Long, TemplateResponse> vrDataList = new Hashtable<Long, TemplateResponse>();
for (TemplateJoinVO vr : templates) {
TemplateResponse vrData = vrDataList.get(vr.getId());
if ( vrData == null ){
// first time encountering this volume
vrData = ApiDBUtils.newTemplateUpdateResponse(vr);
}
else{
// update tags
vrData = ApiDBUtils.fillTemplateDetails(vrData, vr);
}
vrDataList.put(vr.getId(), vrData);
}
return new ArrayList<TemplateResponse>(vrDataList.values());
}
public static List<TemplateResponse> createIsoResponse(TemplateJoinVO... templates) {
Hashtable<Long, TemplateResponse> vrDataList = new Hashtable<Long, TemplateResponse>();
for (TemplateJoinVO vr : templates) {
TemplateResponse vrData = vrDataList.get(vr.getId());
if ( vrData == null ){
// first time encountering this volume
vrData = ApiDBUtils.newIsoResponse(vr);
}
else{
// update tags
vrData = ApiDBUtils.fillTemplateDetails(vrData, vr);
}
vrDataList.put(vr.getId(), vrData);
}
return new ArrayList<TemplateResponse>(vrDataList.values());
}
=======
public static List<AffinityGroupResponse> createAffinityGroupResponses(List<AffinityGroupJoinVO> groups) {
Hashtable<Long, AffinityGroupResponse> vrDataList = new Hashtable<Long, AffinityGroupResponse>();
for (AffinityGroupJoinVO vr : groups) {
AffinityGroupResponse vrData = vrDataList.get(vr.getId());
if (vrData == null) {
// first time encountering this AffinityGroup
vrData = ApiDBUtils.newAffinityGroupResponse(vr);
} else {
// update vms
vrData = ApiDBUtils.fillAffinityGroupDetails(vrData, vr);
}
vrDataList.put(vr.getId(), vrData);
}
return new ArrayList<AffinityGroupResponse>(vrDataList.values());
}
>>>>>>>
public static List<TemplateResponse> createTemplateResponse(TemplateJoinVO... templates) {
Hashtable<Long, TemplateResponse> vrDataList = new Hashtable<Long, TemplateResponse>();
for (TemplateJoinVO vr : templates) {
TemplateResponse vrData = vrDataList.get(vr.getId());
if ( vrData == null ){
// first time encountering this volume
vrData = ApiDBUtils.newTemplateResponse(vr);
}
else{
// update tags
vrData = ApiDBUtils.fillTemplateDetails(vrData, vr);
}
vrDataList.put(vr.getId(), vrData);
}
return new ArrayList<TemplateResponse>(vrDataList.values());
}
public static List<TemplateResponse> createTemplateUpdateResponse(TemplateJoinVO... templates) {
Hashtable<Long, TemplateResponse> vrDataList = new Hashtable<Long, TemplateResponse>();
for (TemplateJoinVO vr : templates) {
TemplateResponse vrData = vrDataList.get(vr.getId());
if ( vrData == null ){
// first time encountering this volume
vrData = ApiDBUtils.newTemplateUpdateResponse(vr);
}
else{
// update tags
vrData = ApiDBUtils.fillTemplateDetails(vrData, vr);
}
vrDataList.put(vr.getId(), vrData);
}
return new ArrayList<TemplateResponse>(vrDataList.values());
}
public static List<TemplateResponse> createIsoResponse(TemplateJoinVO... templates) {
Hashtable<Long, TemplateResponse> vrDataList = new Hashtable<Long, TemplateResponse>();
for (TemplateJoinVO vr : templates) {
TemplateResponse vrData = vrDataList.get(vr.getId());
if ( vrData == null ){
// first time encountering this volume
vrData = ApiDBUtils.newIsoResponse(vr);
}
else{
// update tags
vrData = ApiDBUtils.fillTemplateDetails(vrData, vr);
}
vrDataList.put(vr.getId(), vrData);
}
return new ArrayList<TemplateResponse>(vrDataList.values());
}
public static List<AffinityGroupResponse> createAffinityGroupResponses(List<AffinityGroupJoinVO> groups) {
Hashtable<Long, AffinityGroupResponse> vrDataList = new Hashtable<Long, AffinityGroupResponse>();
for (AffinityGroupJoinVO vr : groups) {
AffinityGroupResponse vrData = vrDataList.get(vr.getId());
if (vrData == null) {
// first time encountering this AffinityGroup
vrData = ApiDBUtils.newAffinityGroupResponse(vr);
} else {
// update vms
vrData = ApiDBUtils.fillAffinityGroupDetails(vrData, vr);
}
vrDataList.put(vr.getId(), vrData);
}
return new ArrayList<AffinityGroupResponse>(vrDataList.values());
} |
<<<<<<<
public static boolean isOfferingForVpc(NetworkOffering offering) {
boolean vpcProvider = _configMgr.isOfferingForVpc(offering);
return vpcProvider;
}
=======
public static List<? extends ResourceTag> listByResourceTypeAndId(TaggedResourceType type, long resourceId) {
return _taggedResourceService.listByResourceTypeAndId(type, resourceId);
}
>>>>>>>
public static boolean isOfferingForVpc(NetworkOffering offering) {
boolean vpcProvider = _configMgr.isOfferingForVpc(offering);
return vpcProvider;
}
public static List<? extends ResourceTag> listByResourceTypeAndId(TaggedResourceType type, long resourceId) {
return _taggedResourceService.listByResourceTypeAndId(type, resourceId);
} |
<<<<<<<
// don't show SSVM/CPVM ips
boolean omitSystemVmIps = false;
if (vlanType == VlanType.VirtualNetwork && (allocatedOnly) && vpcId == null) {
SearchBuilder<NicVO> nonSystemVmSearch = _nicDao.createSearchBuilder();
nonSystemVmSearch.and().op("vmTypeNnull", nonSystemVmSearch.entity().getVmType(), Op.NULL);
nonSystemVmSearch.or("vmType", nonSystemVmSearch.entity().getVmType(), Op.NOTIN);
nonSystemVmSearch.cp();
sb.join("nonSystemVms", nonSystemVmSearch, sb.entity().getAddress(),
nonSystemVmSearch.entity().getIp4Address(), JoinType.LEFTOUTER);
// sb.and().join("nonSystemVms", nonSystemVmSearch, sb.entity().getSourceNetworkId(),
// nonSystemVmSearch.entity().getNetworkId(), JoinType.INNER);
omitSystemVmIps = true;
}
=======
>>>>>>> |
<<<<<<<
List<ResourceLimitVO> searchForLimits(ListResourceLimitsCmd cmd) throws InvalidParameterValueException, PermissionDeniedException;
/**
* Updates an existing resource limit with the specified details. If a limit doesn't exist, will create one.
* @param cmd the command that wraps the domainId, accountId, type, and max parameters
* @return the updated/created resource limit
* @throws InvalidParameterValueException
*/
ResourceLimitVO updateResourceLimit(UpdateResourceLimitCmd cmd) throws InvalidParameterValueException;
=======
public ResourceLimitVO updateResourceLimit(Long domainId, Long accountId, ResourceType type, Long max) throws InvalidParameterValueException;
AccountVO getSystemAccount();
>>>>>>>
List<ResourceLimitVO> searchForLimits(ListResourceLimitsCmd cmd) throws InvalidParameterValueException, PermissionDeniedException;
/**
* Updates an existing resource limit with the specified details. If a limit doesn't exist, will create one.
* @param cmd the command that wraps the domainId, accountId, type, and max parameters
* @return the updated/created resource limit
* @throws InvalidParameterValueException
*/
ResourceLimitVO updateResourceLimit(UpdateResourceLimitCmd cmd) throws InvalidParameterValueException;
AccountVO getSystemAccount(); |
<<<<<<<
@Inject
FirewallManager _firewallMgr;
=======
@Inject
ElasticLoadBalancerManager _elbMgr;
@Inject
NetworkDao _networkDao;
>>>>>>>
@Inject
FirewallManager _firewallMgr;
@Inject
ElasticLoadBalancerManager _elbMgr;
@Inject
NetworkDao _networkDao;
<<<<<<<
public LoadBalancer createLoadBalancerRule(LoadBalancer lb, boolean openFirewall) throws NetworkRuleConflictException {
=======
public LoadBalancer createLoadBalancerRule(CreateLoadBalancerRuleCmd lb) throws NetworkRuleConflictException, InsufficientAddressCapacityException {
>>>>>>>
public LoadBalancer createLoadBalancerRule(CreateLoadBalancerRuleCmd lb, , boolean openFirewall) throws NetworkRuleConflictException, InsufficientAddressCapacityException {
<<<<<<<
=======
LoadBalancer result = _elbMgr.handleCreateLoadBalancerRule(lb, caller.getCaller());
if (result == null){
result = createLoadBalancer(lb);
}
return result;
}
@DB
public LoadBalancer createLoadBalancer(CreateLoadBalancerRuleCmd lb) throws NetworkRuleConflictException {
long ipId = lb.getSourceIpAddressId();
UserContext caller = UserContext.current();
int srcPortStart = lb.getSourcePortStart();
int defPortStart = lb.getDefaultPortStart();
IPAddressVO ipAddr = _ipAddressDao.findById(lb.getSourceIpAddressId());
Long networkId = ipAddr.getSourceNetworkId();
NetworkVO network = _networkDao.findById(networkId);
// make sure ip address exists
if (ipAddr == null || !ipAddr.readyToUse()) {
throw new InvalidParameterValueException("Unable to create load balancer rule, invalid IP address id" + ipId);
}
networkId = ipAddr.getAssociatedWithNetworkId();
if (networkId == null) {
throw new InvalidParameterValueException("Unable to create load balancer rule ; ip id=" + ipId + " is not associated with any network");
}
_accountMgr.checkAccess(caller.getCaller(), ipAddr);
>>>>>>>
LoadBalancer result = _elbMgr.handleCreateLoadBalancerRule(lb, caller.getCaller());
if (result == null){
result = createLoadBalancer(lb);
}
return result;
}
@DB
public LoadBalancer createLoadBalancer(CreateLoadBalancerRuleCmd lb) throws NetworkRuleConflictException {
long ipId = lb.getSourceIpAddressId();
UserContext caller = UserContext.current();
int srcPortStart = lb.getSourcePortStart();
int defPortStart = lb.getDefaultPortStart();
IPAddressVO ipAddr = _ipAddressDao.findById(lb.getSourceIpAddressId());
Long networkId = ipAddr.getSourceNetworkId();
NetworkVO network = _networkDao.findById(networkId);
// make sure ip address exists
if (ipAddr == null || !ipAddr.readyToUse()) {
throw new InvalidParameterValueException("Unable to create load balancer rule, invalid IP address id" + ipId);
}
networkId = ipAddr.getAssociatedWithNetworkId();
if (networkId == null) {
throw new InvalidParameterValueException("Unable to create load balancer rule ; ip id=" + ipId + " is not associated with any network");
}
_accountMgr.checkAccess(caller.getCaller(), ipAddr);
<<<<<<<
Network network = _networkMgr.getNetwork(ipAddr.getAssociatedWithNetworkId());
=======
>>>>>>>
<<<<<<<
throw new InvalidParameterValueException("LB service is not supported in network id=" + network.getId());
=======
throw new InvalidParameterValueException("LB service is not supported in network id= " + networkId);
>>>>>>>
throw new InvalidParameterValueException("LB service is not supported in network id= " + networkId); |
<<<<<<<
import org.apache.cloudstack.engine.subsystem.api.storage.ClusterScope;
=======
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
>>>>>>>
import org.apache.cloudstack.engine.subsystem.api.storage.ClusterScope;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
<<<<<<<
import org.apache.cloudstack.engine.subsystem.api.storage.DataTO;
import org.apache.cloudstack.engine.subsystem.api.storage.HostScope;
import org.apache.cloudstack.engine.subsystem.api.storage.Scope;
import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope;
=======
>>>>>>>
import org.apache.cloudstack.engine.subsystem.api.storage.HostScope;
import org.apache.cloudstack.engine.subsystem.api.storage.Scope;
import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope;
<<<<<<<
=======
@Override
public boolean canHandle(Map<VolumeInfo, DataStore> volumeMap, Host srcHost, Host destHost) {
return false;
}
>>>>>>>
@Override
public boolean canHandle(Map<VolumeInfo, DataStore> volumeMap, Host srcHost, Host destHost) {
return false;
} |
<<<<<<<
import com.cloud.projects.Project;
import com.cloud.projects.ProjectManager;
=======
import com.cloud.resource.ResourceManager;
>>>>>>>
import com.cloud.projects.Project;
import com.cloud.projects.ProjectManager;
import com.cloud.resource.ResourceManager;
<<<<<<<
@Inject
protected FirewallManager _firewallMgr;
@Inject
protected ProjectManager _projectMgr;
=======
@Inject
protected ResourceManager _resourceMgr;
>>>>>>>
@Inject
protected FirewallManager _firewallMgr;
@Inject
protected ProjectManager _projectMgr;
@Inject
protected ResourceManager _resourceMgr; |
<<<<<<<
import com.cloud.vm.State;
=======
import com.cloud.vm.SecondaryStorageVmVO;
>>>>>>>
import com.cloud.vm.SecondaryStorageVmVO;
import com.cloud.vm.State;
<<<<<<<
@Inject DataCenterDao _dcDao;
@Inject HostPodDao _hostPodDao;
@Inject AccountManager _accountMgr;
@Inject NetworkManager _networkMgr;
=======
@Inject ConsoleProxyDao _consoleDao;
@Inject SecondaryStorageVmDao _secStorageDao;
>>>>>>>
@Inject DataCenterDao _dcDao;
@Inject HostPodDao _hostPodDao;
@Inject AccountManager _accountMgr;
@Inject NetworkManager _networkMgr;
@Inject ConsoleProxyDao _consoleDao;
@Inject SecondaryStorageVmDao _secStorageDao;
<<<<<<<
@Override
public HostPodVO createPod(CreatePodCmd cmd) throws InvalidParameterValueException, InternalErrorException {
String cidr = cmd.getCidr();
String endIp = cmd.getEndIp();
String gateway = cmd.getGateway();
String name = cmd.getPodName();
String startIp = cmd.getStartIp();
Long zoneId = cmd.getZoneId();
//verify input parameters
DataCenterVO zone = _zoneDao.findById(zoneId);
if (zone == null) {
throw new InvalidParameterValueException("Failed to create pod " + name + " -- unable to find zone " + zoneId);
}
if (endIp != null && startIp == null) {
throw new InvalidParameterValueException("Failed to create pod " + name + " -- if an end IP is specified, a start IP must be specified.");
}
Long userId = UserContext.current().getUserId();
if (userId == null) {
userId = Long.valueOf(User.UID_SYSTEM);
}
return createPod(userId.longValue(), name, zoneId, gateway, cidr, startIp, endIp);
}
@Override @DB
=======
@Override
@DB
>>>>>>>
@Override
public HostPodVO createPod(CreatePodCmd cmd) throws InvalidParameterValueException, InternalErrorException {
String cidr = cmd.getCidr();
String endIp = cmd.getEndIp();
String gateway = cmd.getGateway();
String name = cmd.getPodName();
String startIp = cmd.getStartIp();
Long zoneId = cmd.getZoneId();
//verify input parameters
DataCenterVO zone = _zoneDao.findById(zoneId);
if (zone == null) {
throw new InvalidParameterValueException("Failed to create pod " + name + " -- unable to find zone " + zoneId);
}
if (endIp != null && startIp == null) {
throw new InvalidParameterValueException("Failed to create pod " + name + " -- if an end IP is specified, a start IP must be specified.");
}
Long userId = UserContext.current().getUserId();
if (userId == null) {
userId = Long.valueOf(User.UID_SYSTEM);
}
return createPod(userId.longValue(), name, zoneId, gateway, cidr, startIp, endIp);
}
@Override @DB
<<<<<<<
@Override @DB
=======
@Override
@DB
>>>>>>>
@Override @DB
<<<<<<<
@Override
// public VlanVO createVlanAndPublicIpRange(long userId, VlanType vlanType, Long zoneId, Long accountId, Long podId, String vlanId, String vlanGateway, String vlanNetmask, String startIP, String endIP) throws InvalidParameterValueException, InternalErrorException {
public VlanVO createVlanAndPublicIpRange(CreateVlanIpRangeCmd cmd) throws InvalidParameterValueException, InternalErrorException, InsufficientCapacityException {
Long userId = UserContext.current().getUserId();
if (userId == null) {
userId = Long.valueOf(User.UID_SYSTEM);
}
// If forVirtualNetworks isn't specified, default it to true
Boolean forVirtualNetwork = cmd.isForVirtualNetwork();
if (forVirtualNetwork == null) {
forVirtualNetwork = Boolean.TRUE;
}
// If the VLAN id is null, default it to untagged
String vlanId = cmd.getVlan();
if (vlanId == null) {
vlanId = Vlan.UNTAGGED;
}
// If an account name and domain ID are specified, look up the account
String accountName = cmd.getAccountName();
Long domainId = cmd.getDomainId();
Account account = null;
if ((accountName != null) && (domainId != null)) {
account = _accountDao.findActiveAccount(accountName, domainId);
if (account == null) {
throw new ServerApiException(BaseCmd.PARAM_ERROR, "Please specify a valid account.");
}
}
VlanType vlanType = forVirtualNetwork ? VlanType.VirtualNetwork : VlanType.DirectAttached;
Long zoneId = cmd.getZoneId();
Long podId = cmd.getPodId();
String startIP = cmd.getStartIp();
String endIP = cmd.getEndIp();
String vlanGateway = cmd.getGateway();
String vlanNetmask = cmd.getNetmask();
=======
@Override
public VlanVO createVlanAndPublicIpRange(long userId, VlanType vlanType, Long zoneId, Long accountId, Long podId, String vlanId, String vlanGateway, String vlanNetmask, String startIP, String endIP) throws InvalidParameterValueException, InternalErrorException {
>>>>>>>
@Override
public VlanVO createVlanAndPublicIpRange(CreateVlanIpRangeCmd cmd) throws InvalidParameterValueException, InternalErrorException, InsufficientCapacityException {
Long userId = UserContext.current().getUserId();
if (userId == null) {
userId = Long.valueOf(User.UID_SYSTEM);
}
// If forVirtualNetworks isn't specified, default it to true
Boolean forVirtualNetwork = cmd.isForVirtualNetwork();
if (forVirtualNetwork == null) {
forVirtualNetwork = Boolean.TRUE;
}
// If the VLAN id is null, default it to untagged
String vlanId = cmd.getVlan();
if (vlanId == null) {
vlanId = Vlan.UNTAGGED;
}
// If an account name and domain ID are specified, look up the account
String accountName = cmd.getAccountName();
Long domainId = cmd.getDomainId();
Account account = null;
if ((accountName != null) && (domainId != null)) {
account = _accountDao.findActiveAccount(accountName, domainId);
if (account == null) {
throw new ServerApiException(BaseCmd.PARAM_ERROR, "Please specify a valid account.");
}
}
VlanType vlanType = forVirtualNetwork ? VlanType.VirtualNetwork : VlanType.DirectAttached;
Long zoneId = cmd.getZoneId();
Long podId = cmd.getPodId();
String startIP = cmd.getStartIp();
String endIP = cmd.getEndIp();
String vlanGateway = cmd.getGateway();
String vlanNetmask = cmd.getNetmask();
<<<<<<<
=======
//if we have an ip range for vlan id=x, vlantype=y; we should
//only allow adding another range with id=x for same type y
if(!vlanId.equals(Vlan.UNTAGGED))
{
VlanVO vlanHandle = _vlanDao.findByZoneAndVlanId(zoneId, vlanId);
if(vlanHandle!=null && !vlanHandle.getVlanType().equals(vlanType))
throw new InvalidParameterValueException("This vlan id is already associated with the vlan type "+vlanHandle.getVlanType().toString()
+",whilst you are trying to associate it with vlan type "+vlanType.toString());
}
>>>>>>>
//if we have an ip range for vlan id=x, vlantype=y; we should
//only allow adding another range with id=x for same type y
if (!vlanId.equals(Vlan.UNTAGGED)) {
VlanVO vlanHandle = _vlanDao.findByZoneAndVlanId(zoneId, vlanId);
if (vlanHandle!=null && !vlanHandle.getVlanType().equals(vlanType))
throw new InvalidParameterValueException("This vlan id is already associated with the vlan type "+vlanHandle.getVlanType().toString()
+",whilst you are trying to associate it with vlan type "+vlanType.toString());
} |
<<<<<<<
=======
import com.cloud.agent.api.DownloadTemplateFromSwiftToSecondaryStorageCommand;
import com.cloud.agent.api.UploadTemplateToSwiftFromSecondaryStorageCommand;
>>>>>>>
<<<<<<<
@Inject VolumeManager _volumeMgr;
@Inject ImageStoreDao _imageStoreDao;
@Inject EndPointSelector _epSelector;
=======
@Inject VolumeManager volumeMgr;
@Inject VMTemplateHostDao templateHostDao;
@Inject
ConfigurationServer _configServer;
>>>>>>>
@Inject VolumeManager _volumeMgr;
@Inject ImageStoreDao _imageStoreDao;
@Inject EndPointSelector _epSelector;
@Inject
ConfigurationServer _configServer;
<<<<<<<
TemplateInfo tmplInfo = this._tmplFactory.getTemplate(templateId, DataStoreRole.Image);
Long zoneId = null;
if (snapshotId != null) {
snapshot = _snapshotDao.findById(snapshotId);
zoneId = snapshot.getDataCenterId();
} else if (volumeId != null) {
volume = _volumeDao.findById(volumeId);
zoneId = volume.getDataCenterId();
}
ZoneScope scope = new ZoneScope(zoneId);
List<DataStore> store = this._dataStoreMgr.getImageStoresByScope(scope);
=======
TemplateInfo tmplInfo = this.tmplFactory.getTemplate(templateId);
ZoneScope scope = null;
Long zoneId = null;
if (snapshotId != null) {
snapshot = _snapshotDao.findById(snapshotId);
zoneId = snapshot.getDataCenterId();
} else if (volumeId != null) {
volume = _volumeDao.findById(volumeId);
zoneId = volume.getDataCenterId();
}
scope = new ZoneScope(zoneId);
List<DataStore> store = this.dataStoreMgr.getImageStores(scope);
>>>>>>>
TemplateInfo tmplInfo = this._tmplFactory.getTemplate(templateId, DataStoreRole.Image);
Long zoneId = null;
if (snapshotId != null) {
snapshot = _snapshotDao.findById(snapshotId);
zoneId = snapshot.getDataCenterId();
} else if (volumeId != null) {
volume = _volumeDao.findById(volumeId);
zoneId = volume.getDataCenterId();
}
ZoneScope scope = new ZoneScope(zoneId);
List<DataStore> store = this._dataStoreMgr.getImageStoresByScope(scope);
<<<<<<<
volume = _volumeDao.findById(volumeId);
VolumeInfo volInfo = this._volFactory.getVolume(volumeId);
future = this._tmpltSvr.createTemplateFromVolumeAsync(volInfo, tmplInfo, store.get(0));
=======
VolumeInfo volInfo = this.volFactory.getVolume(volumeId);
future = this.imageSvr.createTemplateFromVolumeAsync(volInfo, tmplInfo, store.get(0));
>>>>>>>
VolumeInfo volInfo = this._volFactory.getVolume(volumeId);
future = this._tmpltSvr.createTemplateFromVolumeAsync(volInfo, tmplInfo, store.get(0)); |
<<<<<<<
List<VirtualRouter> addVirtualMachineIntoNetwork(Network config, NicProfile nic, VirtualMachineProfile<UserVm> vm, DeployDestination dest, ReservationContext context, List<DomainRouterVO> routers) throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException;
=======
boolean deleteRemoteAccessVpn(Network network, RemoteAccessVpn vpn) throws ResourceUnavailableException;
>>>>>>>
List<VirtualRouter> addVirtualMachineIntoNetwork(Network config, NicProfile nic, VirtualMachineProfile<UserVm> vm, DeployDestination dest, ReservationContext context, List<DomainRouterVO> routers) throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException;
boolean deleteRemoteAccessVpn(Network network, RemoteAccessVpn vpn) throws ResourceUnavailableException;
<<<<<<<
List<VirtualRouter> getRoutersForNetwork(long networkId);
=======
>>>>>>> |
<<<<<<<
EntityActor actor = (EntityActor) player.world.getEntityByID(message.id);
=======
EntityLivingBase actor = (EntityLivingBase) player.worldObj.getEntityByID(message.id);
RecordPlayer playback = EntityUtils.getRecordPlayer(actor);
>>>>>>>
EntityLivingBase actor = (EntityLivingBase) player.world.getEntityByID(message.id);
RecordPlayer playback = EntityUtils.getRecordPlayer(actor); |
<<<<<<<
@Override
public boolean plugNic(Network network, NicTO nic, VirtualMachineTO vm,
ReservationContext context, DeployDestination dest) throws ConcurrentOperationException, ResourceUnavailableException,
InsufficientCapacityException {
//not supported
throw new UnsupportedOperationException("Plug nic is not supported for vm of type " + vm.getType());
}
@Override
public boolean unplugNic(Network network, NicTO nic, VirtualMachineTO vm,
ReservationContext context, DeployDestination dest) throws ConcurrentOperationException, ResourceUnavailableException {
//not supported
throw new UnsupportedOperationException("Unplug nic is not supported for vm of type " + vm.getType());
}
=======
@Override
public boolean recreateNeeded(
VirtualMachineProfile<ConsoleProxyVO> profile, long hostId,
Commands cmds, ReservationContext context) {
// TODO Auto-generated method stub
return false;
}
>>>>>>>
@Override
public boolean plugNic(Network network, NicTO nic, VirtualMachineTO vm,
ReservationContext context, DeployDestination dest) throws ConcurrentOperationException, ResourceUnavailableException,
InsufficientCapacityException {
//not supported
throw new UnsupportedOperationException("Plug nic is not supported for vm of type " + vm.getType());
}
@Override
public boolean unplugNic(Network network, NicTO nic, VirtualMachineTO vm,
ReservationContext context, DeployDestination dest) throws ConcurrentOperationException, ResourceUnavailableException {
//not supported
throw new UnsupportedOperationException("Unplug nic is not supported for vm of type " + vm.getType());
}
@Override
public boolean recreateNeeded(
VirtualMachineProfile<ConsoleProxyVO> profile, long hostId,
Commands cmds, ReservationContext context) {
// TODO Auto-generated method stub
return false;
} |
<<<<<<<
import com.cloud.network.NetworkManager;
=======
import com.cloud.hypervisor.kvm.discoverer.KvmDummyResourceBase;
import com.cloud.network.NetworkModel;
>>>>>>>
import com.cloud.network.NetworkModel;
<<<<<<<
Listener, ResourceStateAdapter {
private static final Logger s_logger = Logger.getLogger(KvmServerDiscoverer.class);
private String _hostIp;
private final int _waitTime = 5; /*wait for 5 minutes*/
private String _kvmPrivateNic;
private String _kvmPublicNic;
private String _kvmGuestNic;
@Inject HostDao _hostDao = null;
@Inject ClusterDao _clusterDao;
@Inject ResourceManager _resourceMgr;
@Inject AgentManager _agentMgr;
@Inject NetworkManager _networkMgr;
@Inject ConfigurationDao _configDao;
@Override
public boolean processAnswers(long agentId, long seq, Answer[] answers) {
// TODO Auto-generated method stub
return false;
}
@Override
public boolean processCommands(long agentId, long seq, Command[] commands) {
// TODO Auto-generated method stub
return false;
}
@Override
public AgentControlAnswer processControlCommand(long agentId,
AgentControlCommand cmd) {
// TODO Auto-generated method stub
return null;
}
@Override
public void processConnect(HostVO host, StartupCommand cmd, boolean forRebalance) {
}
@Override
public boolean processDisconnect(long agentId, Status state) {
// TODO Auto-generated method stub
return false;
}
@Override
public boolean isRecurring() {
// TODO Auto-generated method stub
return false;
}
@Override
public int getTimeout() {
// TODO Auto-generated method stub
return 0;
}
@Override
public boolean processTimeout(long agentId, long seq) {
// TODO Auto-generated method stub
return false;
}
@Override
public Map<? extends ServerResource, Map<String, String>> find(long dcId,
Long podId, Long clusterId, URI uri, String username,
String password, List<String> hostTags) throws DiscoveryException {
=======
Listener, ResourceStateAdapter {
private static final Logger s_logger = Logger.getLogger(KvmServerDiscoverer.class);
private ConfigurationDao _configDao;
private String _hostIp;
private int _waitTime = 5; /*wait for 5 minutes*/
private String _kvmPrivateNic;
private String _kvmPublicNic;
private String _kvmGuestNic;
@Inject HostDao _hostDao = null;
@Inject ClusterDao _clusterDao;
@Inject ResourceManager _resourceMgr;
@Inject AgentManager _agentMgr;
@Inject NetworkModel _networkMgr;
@Override
public boolean processAnswers(long agentId, long seq, Answer[] answers) {
// TODO Auto-generated method stub
return false;
}
@Override
public boolean processCommands(long agentId, long seq, Command[] commands) {
// TODO Auto-generated method stub
return false;
}
@Override
public AgentControlAnswer processControlCommand(long agentId,
AgentControlCommand cmd) {
// TODO Auto-generated method stub
return null;
}
@Override
public void processConnect(HostVO host, StartupCommand cmd, boolean forRebalance) {
}
@Override
public boolean processDisconnect(long agentId, Status state) {
// TODO Auto-generated method stub
return false;
}
@Override
public boolean isRecurring() {
// TODO Auto-generated method stub
return false;
}
@Override
public int getTimeout() {
// TODO Auto-generated method stub
return 0;
}
@Override
public boolean processTimeout(long agentId, long seq) {
// TODO Auto-generated method stub
return false;
}
@Override
public Map<? extends ServerResource, Map<String, String>> find(long dcId,
Long podId, Long clusterId, URI uri, String username,
String password, List<String> hostTags) throws DiscoveryException {
>>>>>>>
Listener, ResourceStateAdapter {
private static final Logger s_logger = Logger.getLogger(KvmServerDiscoverer.class);
private String _hostIp;
private final int _waitTime = 5; /*wait for 5 minutes*/
private String _kvmPrivateNic;
private String _kvmPublicNic;
private String _kvmGuestNic;
@Inject HostDao _hostDao = null;
@Inject ClusterDao _clusterDao;
@Inject ResourceManager _resourceMgr;
@Inject AgentManager _agentMgr;
@Inject ConfigurationDao _configDao;
@Inject NetworkModel _networkMgr;
@Override
public boolean processAnswers(long agentId, long seq, Answer[] answers) {
// TODO Auto-generated method stub
return false;
}
@Override
public boolean processCommands(long agentId, long seq, Command[] commands) {
// TODO Auto-generated method stub
return false;
}
@Override
public AgentControlAnswer processControlCommand(long agentId,
AgentControlCommand cmd) {
// TODO Auto-generated method stub
return null;
}
@Override
public void processConnect(HostVO host, StartupCommand cmd, boolean forRebalance) {
}
@Override
public boolean processDisconnect(long agentId, Status state) {
// TODO Auto-generated method stub
return false;
}
@Override
public boolean isRecurring() {
// TODO Auto-generated method stub
return false;
}
@Override
public int getTimeout() {
// TODO Auto-generated method stub
return 0;
}
@Override
public boolean processTimeout(long agentId, long seq) {
// TODO Auto-generated method stub
return false;
}
@Override
public Map<? extends ServerResource, Map<String, String>> find(long dcId,
Long podId, Long clusterId, URI uri, String username,
String password, List<String> hostTags) throws DiscoveryException { |
<<<<<<<
} else if (cmd instanceof StorageSubSystemCommand) {
return this.storageHandler.handleStorageCommands((StorageSubSystemCommand)cmd);
=======
} else if (cmd instanceof PvlanSetupCommand) {
return execute((PvlanSetupCommand) cmd);
>>>>>>>
} else if (cmd instanceof StorageSubSystemCommand) {
return this.storageHandler.handleStorageCommands((StorageSubSystemCommand)cmd);
} else if (cmd instanceof PvlanSetupCommand) {
return execute((PvlanSetupCommand) cmd); |
<<<<<<<
import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
=======
import org.apache.cloudstack.region.*;
import org.apache.cloudstack.region.dao.RegionDao;
>>>>>>>
import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
import org.apache.cloudstack.region.*;
import org.apache.cloudstack.region.dao.RegionDao; |
<<<<<<<
import com.cloud.utils.component.Adapters;
=======
import com.cloud.utils.PropertiesUtil;
import com.cloud.utils.StringUtils;
>>>>>>>
import com.cloud.utils.component.Adapters;
import com.cloud.utils.PropertiesUtil;
import com.cloud.utils.StringUtils;
<<<<<<<
=======
private static boolean isCommandAvailable(String commandName) {
boolean isCommandAvailable = false;
isCommandAvailable = s_allCommands.contains(commandName);
return isCommandAvailable;
}
>>>>>>> |
<<<<<<<
import org.apache.cloudstack.acl.APIAccessChecker;
import org.apache.cloudstack.acl.APILimitChecker;
import org.apache.cloudstack.acl.ControlledEntity;
=======
import org.apache.cloudstack.acl.APIChecker;
import org.apache.cloudstack.acl.RoleType;
>>>>>>>
import org.apache.cloudstack.acl.APILimitChecker;
import org.apache.cloudstack.acl.APIChecker;
import org.apache.cloudstack.acl.RoleType;
<<<<<<<
@Inject(adapter = APILimitChecker.class)
protected Adapters<APILimitChecker> _apiLimitCheckers;
@Inject(adapter = APIAccessChecker.class)
protected Adapters<APIAccessChecker> _apiAccessCheckers;
=======
@Inject(adapter = APIChecker.class)
protected Adapters<APIChecker> _apiAccessCheckers;
>>>>>>>
@Inject(adapter = APILimitChecker.class)
protected Adapters<APILimitChecker> _apiLimitCheckers;
@Inject(adapter = APIChecker.class)
protected Adapters<APIChecker> _apiAccessCheckers;
<<<<<<<
private boolean isRequestAllowed(User user) {
Account account = ApiDBUtils.findAccountById(user.getAccountId());
if ( _accountMgr.isRootAdmin(account.getType()) ){
// no api throttling for root admin
return true;
}
for (APILimitChecker apiChecker : _apiLimitCheckers) {
// Fail the checking if any checker fails to verify
if (!apiChecker.isUnderLimit(account))
return false;
}
return true;
}
=======
private boolean doesCommandExist(String apiName) {
for (APIChecker apiChecker : _apiAccessCheckers) {
// If any checker has api info on the command, return true
if (apiChecker.checkExistence(apiName))
return true;
}
return false;
}
>>>>>>>
private boolean isRequestAllowed(User user) {
Account account = ApiDBUtils.findAccountById(user.getAccountId());
if ( _accountMgr.isRootAdmin(account.getType()) ){
// no api throttling for root admin
return true;
}
for (APILimitChecker apiChecker : _apiLimitCheckers) {
// Fail the checking if any checker fails to verify
if (!apiChecker.isUnderLimit(account))
return false;
}
return true;
}
private boolean doesCommandExist(String apiName) {
for (APIChecker apiChecker : _apiAccessCheckers) {
// If any checker has api info on the command, return true
if (apiChecker.checkExistence(apiName))
return true;
}
return false;
} |
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
List<NetworkOfferingVO> requiredOfferings = _networkOfferingDao.listByAvailability(Availability.Required, false);
if (requiredOfferings.size() < 1) {
throw new CloudRuntimeException("Unable to find network offering with availability=" +
Availability.Required + " to automatically create the network as part of createVlanIpRange");
}
>>>>>>>
<<<<<<<
=======
>>>>>>> |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.