1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-07 03:22:57 +03:00

changed to use new MCS cloud scripts

This commit is contained in:
david hill
2016-11-09 13:48:06 -06:00
parent cdc17de551
commit 401c3b4929

View File

@@ -7567,7 +7567,7 @@ namespace oam
std::string Oam::getEC2InstanceIpAddress(std::string instanceName) std::string Oam::getEC2InstanceIpAddress(std::string instanceName)
{ {
// run script to get Instance status and IP Address // run script to get Instance status and IP Address
string cmd = InstallDir + "/bin/IDBInstanceCmds.sh getPrivateIP " + instanceName + " > /tmp/getCloudIP_" + instanceName; string cmd = InstallDir + "/bin/MCSInstanceCmds.sh getPrivateIP " + instanceName + " > /tmp/getCloudIP_" + instanceName;
system(cmd.c_str()); system(cmd.c_str());
if (checkLogStatus("/tmp/getCloudIP_" + instanceName, "stopped") ) if (checkLogStatus("/tmp/getCloudIP_" + instanceName, "stopped") )
@@ -7604,7 +7604,7 @@ namespace oam
std::string Oam::getEC2LocalInstance(std::string name) std::string Oam::getEC2LocalInstance(std::string name)
{ {
// run script to get Instance status and IP Address // run script to get Instance status and IP Address
string cmd = InstallDir + "/bin/IDBInstanceCmds.sh getInstance > /tmp/getInstanceInfo_" + name; string cmd = InstallDir + "/bin/MCSInstanceCmds.sh getInstance > /tmp/getInstanceInfo_" + name;
int status = system(cmd.c_str()); int status = system(cmd.c_str());
if (WEXITSTATUS(status) != 0 ) if (WEXITSTATUS(status) != 0 )
return "failed"; return "failed";
@@ -7635,7 +7635,7 @@ namespace oam
std::string Oam::getEC2LocalInstanceType(std::string name) std::string Oam::getEC2LocalInstanceType(std::string name)
{ {
// run script to get Instance status and IP Address // run script to get Instance status and IP Address
string cmd = InstallDir + "/bin/IDBInstanceCmds.sh getType > /tmp/getInstanceType_" + name; string cmd = InstallDir + "/bin/MCSInstanceCmds.sh getType > /tmp/getInstanceType_" + name;
int status = system(cmd.c_str()); int status = system(cmd.c_str());
if (WEXITSTATUS(status) != 0 ) if (WEXITSTATUS(status) != 0 )
return "failed"; return "failed";
@@ -7666,7 +7666,7 @@ namespace oam
std::string Oam::getEC2LocalInstanceSubnet(std::string name) std::string Oam::getEC2LocalInstanceSubnet(std::string name)
{ {
// run script to get Instance Subnet // run script to get Instance Subnet
string cmd = InstallDir + "/bin/IDBInstanceCmds.sh getSubnet > /tmp/getInstanceSubnet_" + name; string cmd = InstallDir + "/bin/MCSInstanceCmds.sh getSubnet > /tmp/getInstanceSubnet_" + name;
int status = system(cmd.c_str()); int status = system(cmd.c_str());
if (WEXITSTATUS(status) != 0 ) if (WEXITSTATUS(status) != 0 )
return "failed"; return "failed";
@@ -7698,7 +7698,7 @@ namespace oam
std::string Oam::launchEC2Instance( const std::string name, const std::string IPAddress, const std::string type, const std::string group) std::string Oam::launchEC2Instance( const std::string name, const std::string IPAddress, const std::string type, const std::string group)
{ {
// run script to get Instance status and IP Address // run script to get Instance status and IP Address
string cmd = InstallDir + "/bin/IDBInstanceCmds.sh launchInstance " + IPAddress + " " + type + " " + group + " > /tmp/getInstance_" + name; string cmd = InstallDir + "/bin/MCSInstanceCmds.sh launchInstance " + IPAddress + " " + type + " " + group + " > /tmp/getInstance_" + name;
int status = system(cmd.c_str()); int status = system(cmd.c_str());
if (WEXITSTATUS(status) != 0 ) if (WEXITSTATUS(status) != 0 )
return "failed"; return "failed";
@@ -7740,7 +7740,7 @@ namespace oam
void Oam::terminateEC2Instance(std::string instanceName) void Oam::terminateEC2Instance(std::string instanceName)
{ {
// run script to get Instance status and IP Address // run script to get Instance status and IP Address
string cmd = InstallDir + "/bin/IDBInstanceCmds.sh terminateInstance " + instanceName + " > /tmp/terminateEC2Instance_" + instanceName; string cmd = InstallDir + "/bin/MCSInstanceCmds.sh terminateInstance " + instanceName + " > /tmp/terminateEC2Instance_" + instanceName;
system(cmd.c_str()); system(cmd.c_str());
return; return;
@@ -7757,7 +7757,7 @@ namespace oam
void Oam::stopEC2Instance(std::string instanceName) void Oam::stopEC2Instance(std::string instanceName)
{ {
// run script to get Instance status and IP Address // run script to get Instance status and IP Address
string cmd = InstallDir + "/bin/IDBInstanceCmds.sh stopInstance " + instanceName + " > /tmp/stopEC2Instance_" + instanceName; string cmd = InstallDir + "/bin/MCSInstanceCmds.sh stopInstance " + instanceName + " > /tmp/stopEC2Instance_" + instanceName;
system(cmd.c_str()); system(cmd.c_str());
return; return;
@@ -7774,7 +7774,7 @@ namespace oam
bool Oam::startEC2Instance(std::string instanceName) bool Oam::startEC2Instance(std::string instanceName)
{ {
// run script to get Instance status and IP Address // run script to get Instance status and IP Address
string cmd = InstallDir + "/bin/IDBInstanceCmds.sh startInstance " + instanceName + " > /tmp/startEC2Instance_" + instanceName; string cmd = InstallDir + "/bin/MCSInstanceCmds.sh startInstance " + instanceName + " > /tmp/startEC2Instance_" + instanceName;
int ret = system(cmd.c_str()); int ret = system(cmd.c_str());
if (WEXITSTATUS(ret) != 0 ) if (WEXITSTATUS(ret) != 0 )
return false; return false;
@@ -7793,7 +7793,7 @@ namespace oam
bool Oam::assignElasticIP(std::string instanceName, std::string IpAddress) bool Oam::assignElasticIP(std::string instanceName, std::string IpAddress)
{ {
// run script to get Instance status and IP Address // run script to get Instance status and IP Address
string cmd = InstallDir + "/bin/IDBInstanceCmds.sh assignElasticIP " + instanceName + " " + IpAddress + " > /tmp/assignElasticIP_" + instanceName; string cmd = InstallDir + "/bin/MCSInstanceCmds.sh assignElasticIP " + instanceName + " " + IpAddress + " > /tmp/assignElasticIP_" + instanceName;
int ret = system(cmd.c_str()); int ret = system(cmd.c_str());
if (WEXITSTATUS(ret) != 0 ) if (WEXITSTATUS(ret) != 0 )
exceptionControl("assignElasticIP", oam::API_FAILURE); exceptionControl("assignElasticIP", oam::API_FAILURE);
@@ -7812,7 +7812,7 @@ namespace oam
bool Oam::deassignElasticIP(std::string IpAddress) bool Oam::deassignElasticIP(std::string IpAddress)
{ {
// run script to get Instance status and IP Address // run script to get Instance status and IP Address
string cmd = InstallDir + "/bin/IDBInstanceCmds.sh deassignElasticIP " + IpAddress + " > /tmp/deassignElasticIP_" + IpAddress; string cmd = InstallDir + "/bin/MCSInstanceCmds.sh deassignElasticIP " + IpAddress + " > /tmp/deassignElasticIP_" + IpAddress;
int ret = system(cmd.c_str()); int ret = system(cmd.c_str());
if (WEXITSTATUS(ret) != 0 ) if (WEXITSTATUS(ret) != 0 )
exceptionControl("deassignElasticIP", oam::API_FAILURE); exceptionControl("deassignElasticIP", oam::API_FAILURE);
@@ -7831,7 +7831,7 @@ namespace oam
std::string Oam::getEC2VolumeStatus(std::string volumeName) std::string Oam::getEC2VolumeStatus(std::string volumeName)
{ {
// run script to get Volume Status // run script to get Volume Status
string cmd = InstallDir + "/bin/IDBVolumeCmds.sh describe " + volumeName + " > /tmp/getVolumeStatus_" + volumeName; string cmd = InstallDir + "/bin/MCSVolumeCmds.sh describe " + volumeName + " > /tmp/getVolumeStatus_" + volumeName;
int ret = system(cmd.c_str()); int ret = system(cmd.c_str());
if (WEXITSTATUS(ret) != 0 ) if (WEXITSTATUS(ret) != 0 )
return "failed"; return "failed";
@@ -7862,7 +7862,7 @@ namespace oam
std::string Oam::createEC2Volume(std::string size, std::string name) std::string Oam::createEC2Volume(std::string size, std::string name)
{ {
// run script to get Volume Status // run script to get Volume Status
string cmd = InstallDir + "/bin/IDBVolumeCmds.sh create " + size + " " + name + " > /tmp/createVolumeStatus_" + name; string cmd = InstallDir + "/bin/MCSVolumeCmds.sh create " + size + " " + name + " > /tmp/createVolumeStatus_" + name;
int ret = system(cmd.c_str()); int ret = system(cmd.c_str());
if (WEXITSTATUS(ret) != 0 ) if (WEXITSTATUS(ret) != 0 )
return "failed"; return "failed";
@@ -7906,7 +7906,7 @@ namespace oam
for ( int retry = 0 ; retry < 2 ; retry++ ) for ( int retry = 0 ; retry < 2 ; retry++ )
{ {
// run script to attach Volume // run script to attach Volume
string cmd = InstallDir + "/bin/IDBVolumeCmds.sh attach " + volumeName + " " + instanceName + " " + deviceName + " > /tmp/attachVolumeStatus_" + volumeName; string cmd = InstallDir + "/bin/MCSVolumeCmds.sh attach " + volumeName + " " + instanceName + " " + deviceName + " > /tmp/attachVolumeStatus_" + volumeName;
ret = system(cmd.c_str()); ret = system(cmd.c_str());
if (WEXITSTATUS(ret) == 0 ) if (WEXITSTATUS(ret) == 0 )
@@ -7933,7 +7933,7 @@ namespace oam
bool Oam::detachEC2Volume(std::string volumeName) bool Oam::detachEC2Volume(std::string volumeName)
{ {
// run script to attach Volume // run script to attach Volume
string cmd = InstallDir + "/bin/IDBVolumeCmds.sh detach " + volumeName + " > /tmp/detachVolumeStatus_" + volumeName; string cmd = InstallDir + "/bin/MCSVolumeCmds.sh detach " + volumeName + " > /tmp/detachVolumeStatus_" + volumeName;
int ret = system(cmd.c_str()); int ret = system(cmd.c_str());
if (WEXITSTATUS(ret) != 0 ) if (WEXITSTATUS(ret) != 0 )
return false; return false;
@@ -7952,7 +7952,7 @@ namespace oam
bool Oam::deleteEC2Volume(std::string volumeName) bool Oam::deleteEC2Volume(std::string volumeName)
{ {
// run script to delete Volume // run script to delete Volume
string cmd = InstallDir + "/bin/IDBVolumeCmds.sh delete " + volumeName + " > /tmp/deleteVolumeStatus_" + volumeName; string cmd = InstallDir + "/bin/MCSVolumeCmds.sh delete " + volumeName + " > /tmp/deleteVolumeStatus_" + volumeName;
int ret = system(cmd.c_str()); int ret = system(cmd.c_str());
if (WEXITSTATUS(ret) != 0 ) if (WEXITSTATUS(ret) != 0 )
return false; return false;
@@ -7971,7 +7971,7 @@ namespace oam
bool Oam::createEC2tag(std::string resourceName, std::string tagName, std::string tagValue) bool Oam::createEC2tag(std::string resourceName, std::string tagName, std::string tagValue)
{ {
// run script to create a tag // run script to create a tag
string cmd = InstallDir + "/bin/IDBVolumeCmds.sh createTag " + resourceName + " " + tagName + " " + tagValue + " > /tmp/createTagStatus_" + resourceName; string cmd = InstallDir + "/bin/MCSVolumeCmds.sh createTag " + resourceName + " " + tagName + " " + tagValue + " > /tmp/createTagStatus_" + resourceName;
int ret = system(cmd.c_str()); int ret = system(cmd.c_str());
if (WEXITSTATUS(ret) != 0 ) if (WEXITSTATUS(ret) != 0 )
return false; return false;