Repository: airavata Updated Branches: refs/heads/master fc25c7284 -> b95e92060
change data type to list instead of Set - AIRAVATA-1477 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b95e9206 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b95e9206 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b95e9206 Branch: refs/heads/master Commit: b95e9206037a712c93d51759d4287cac740b0e94 Parents: fc25c72 Author: Chathuri Wimalasena <[email protected]> Authored: Fri Oct 24 11:26:52 2014 -0400 Committer: Chathuri Wimalasena <[email protected]> Committed: Fri Oct 24 11:26:52 2014 -0400 ---------------------------------------------------------------------- .../lib/airavata/computeResourceModel_types.cpp | 150 +++++++++---------- .../lib/airavata/computeResourceModel_types.h | 12 +- .../Model/AppCatalog/ComputeResource/Types.php | 72 ++++----- .../client/samples/CreateLaunchExperiment.java | 2 +- .../tools/RegisterSampleApplications.java | 26 ++-- .../tools/RegisterSampleApplicationsUtils.java | 2 +- .../ComputeResourceDescription.java | 72 ++++----- .../computeResourceModel.thrift | 4 +- .../client/tools/DocumentCreatorNew.java | 2 +- .../client/tools/DocumentCreatorUtils.java | 3 +- .../catalog/data/impl/ComputeResourceImpl.java | 6 +- .../data/util/AppCatalogThriftConversion.java | 8 +- .../app/catalog/test/ComputeResourceTest.java | 9 +- .../integration/tools/DocumentCreatorNew.java | 9 +- .../integration/tools/DocumentCreatorUtils.java | 3 +- 15 files changed, 183 insertions(+), 197 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/b95e9206/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.cpp index 0f1d50c..2555cb8 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.cpp @@ -1580,8 +1580,8 @@ void swap(DataMovementInterface &a, DataMovementInterface &b) { swap(a.priorityOrder, b.priorityOrder); } -const char* ComputeResourceDescription::ascii_fingerprint = "2CAAC3134218EFF83D46106C39BECE65"; -const uint8_t ComputeResourceDescription::binary_fingerprint[16] = {0x2C,0xAA,0xC3,0x13,0x42,0x18,0xEF,0xF8,0x3D,0x46,0x10,0x6C,0x39,0xBE,0xCE,0x65}; +const char* ComputeResourceDescription::ascii_fingerprint = "CA924FC1A07D7956848B049D2CACF3EC"; +const uint8_t ComputeResourceDescription::binary_fingerprint[16] = {0xCA,0x92,0x4F,0xC1,0xA0,0x7D,0x79,0x56,0x84,0x8B,0x04,0x9D,0x2C,0xAC,0xF3,0xEC}; uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol* iprot) { @@ -1622,20 +1622,19 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol* } break; case 3: - if (ftype == ::apache::thrift::protocol::T_SET) { + if (ftype == ::apache::thrift::protocol::T_LIST) { { this->hostAliases.clear(); uint32_t _size32; ::apache::thrift::protocol::TType _etype35; - xfer += iprot->readSetBegin(_etype35, _size32); + xfer += iprot->readListBegin(_etype35, _size32); + this->hostAliases.resize(_size32); uint32_t _i36; for (_i36 = 0; _i36 < _size32; ++_i36) { - std::string _elem37; - xfer += iprot->readString(_elem37); - this->hostAliases.insert(_elem37); + xfer += iprot->readString(this->hostAliases[_i36]); } - xfer += iprot->readSetEnd(); + xfer += iprot->readListEnd(); } this->__isset.hostAliases = true; } else { @@ -1643,20 +1642,19 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol* } break; case 4: - if (ftype == ::apache::thrift::protocol::T_SET) { + if (ftype == ::apache::thrift::protocol::T_LIST) { { this->ipAddresses.clear(); - uint32_t _size38; - ::apache::thrift::protocol::TType _etype41; - xfer += iprot->readSetBegin(_etype41, _size38); - uint32_t _i42; - for (_i42 = 0; _i42 < _size38; ++_i42) + uint32_t _size37; + ::apache::thrift::protocol::TType _etype40; + xfer += iprot->readListBegin(_etype40, _size37); + this->ipAddresses.resize(_size37); + uint32_t _i41; + for (_i41 = 0; _i41 < _size37; ++_i41) { - std::string _elem43; - xfer += iprot->readString(_elem43); - this->ipAddresses.insert(_elem43); + xfer += iprot->readString(this->ipAddresses[_i41]); } - xfer += iprot->readSetEnd(); + xfer += iprot->readListEnd(); } this->__isset.ipAddresses = true; } else { @@ -1675,14 +1673,14 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol* if (ftype == ::apache::thrift::protocol::T_LIST) { { this->batchQueues.clear(); - uint32_t _size44; - ::apache::thrift::protocol::TType _etype47; - xfer += iprot->readListBegin(_etype47, _size44); - this->batchQueues.resize(_size44); - uint32_t _i48; - for (_i48 = 0; _i48 < _size44; ++_i48) + uint32_t _size42; + ::apache::thrift::protocol::TType _etype45; + xfer += iprot->readListBegin(_etype45, _size42); + this->batchQueues.resize(_size42); + uint32_t _i46; + for (_i46 = 0; _i46 < _size42; ++_i46) { - xfer += this->batchQueues[_i48].read(iprot); + xfer += this->batchQueues[_i46].read(iprot); } xfer += iprot->readListEnd(); } @@ -1695,19 +1693,19 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol* if (ftype == ::apache::thrift::protocol::T_MAP) { { this->fileSystems.clear(); - uint32_t _size49; - ::apache::thrift::protocol::TType _ktype50; - ::apache::thrift::protocol::TType _vtype51; - xfer += iprot->readMapBegin(_ktype50, _vtype51, _size49); - uint32_t _i53; - for (_i53 = 0; _i53 < _size49; ++_i53) + uint32_t _size47; + ::apache::thrift::protocol::TType _ktype48; + ::apache::thrift::protocol::TType _vtype49; + xfer += iprot->readMapBegin(_ktype48, _vtype49, _size47); + uint32_t _i51; + for (_i51 = 0; _i51 < _size47; ++_i51) { - FileSystems::type _key54; - int32_t ecast56; - xfer += iprot->readI32(ecast56); - _key54 = (FileSystems::type)ecast56; - std::string& _val55 = this->fileSystems[_key54]; - xfer += iprot->readString(_val55); + FileSystems::type _key52; + int32_t ecast54; + xfer += iprot->readI32(ecast54); + _key52 = (FileSystems::type)ecast54; + std::string& _val53 = this->fileSystems[_key52]; + xfer += iprot->readString(_val53); } xfer += iprot->readMapEnd(); } @@ -1720,14 +1718,14 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol* if (ftype == ::apache::thrift::protocol::T_LIST) { { this->jobSubmissionInterfaces.clear(); - uint32_t _size57; - ::apache::thrift::protocol::TType _etype60; - xfer += iprot->readListBegin(_etype60, _size57); - this->jobSubmissionInterfaces.resize(_size57); - uint32_t _i61; - for (_i61 = 0; _i61 < _size57; ++_i61) + uint32_t _size55; + ::apache::thrift::protocol::TType _etype58; + xfer += iprot->readListBegin(_etype58, _size55); + this->jobSubmissionInterfaces.resize(_size55); + uint32_t _i59; + for (_i59 = 0; _i59 < _size55; ++_i59) { - xfer += this->jobSubmissionInterfaces[_i61].read(iprot); + xfer += this->jobSubmissionInterfaces[_i59].read(iprot); } xfer += iprot->readListEnd(); } @@ -1740,14 +1738,14 @@ uint32_t ComputeResourceDescription::read(::apache::thrift::protocol::TProtocol* if (ftype == ::apache::thrift::protocol::T_LIST) { { this->dataMovementInterfaces.clear(); - uint32_t _size62; - ::apache::thrift::protocol::TType _etype65; - xfer += iprot->readListBegin(_etype65, _size62); - this->dataMovementInterfaces.resize(_size62); - uint32_t _i66; - for (_i66 = 0; _i66 < _size62; ++_i66) + uint32_t _size60; + ::apache::thrift::protocol::TType _etype63; + xfer += iprot->readListBegin(_etype63, _size60); + this->dataMovementInterfaces.resize(_size60); + uint32_t _i64; + for (_i64 = 0; _i64 < _size60; ++_i64) { - xfer += this->dataMovementInterfaces[_i66].read(iprot); + xfer += this->dataMovementInterfaces[_i64].read(iprot); } xfer += iprot->readListEnd(); } @@ -1785,28 +1783,28 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol xfer += oprot->writeFieldEnd(); if (this->__isset.hostAliases) { - xfer += oprot->writeFieldBegin("hostAliases", ::apache::thrift::protocol::T_SET, 3); + xfer += oprot->writeFieldBegin("hostAliases", ::apache::thrift::protocol::T_LIST, 3); { - xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->hostAliases.size())); - std::set<std::string> ::const_iterator _iter67; - for (_iter67 = this->hostAliases.begin(); _iter67 != this->hostAliases.end(); ++_iter67) + xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->hostAliases.size())); + std::vector<std::string> ::const_iterator _iter65; + for (_iter65 = this->hostAliases.begin(); _iter65 != this->hostAliases.end(); ++_iter65) { - xfer += oprot->writeString((*_iter67)); + xfer += oprot->writeString((*_iter65)); } - xfer += oprot->writeSetEnd(); + xfer += oprot->writeListEnd(); } xfer += oprot->writeFieldEnd(); } if (this->__isset.ipAddresses) { - xfer += oprot->writeFieldBegin("ipAddresses", ::apache::thrift::protocol::T_SET, 4); + xfer += oprot->writeFieldBegin("ipAddresses", ::apache::thrift::protocol::T_LIST, 4); { - xfer += oprot->writeSetBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->ipAddresses.size())); - std::set<std::string> ::const_iterator _iter68; - for (_iter68 = this->ipAddresses.begin(); _iter68 != this->ipAddresses.end(); ++_iter68) + xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->ipAddresses.size())); + std::vector<std::string> ::const_iterator _iter66; + for (_iter66 = this->ipAddresses.begin(); _iter66 != this->ipAddresses.end(); ++_iter66) { - xfer += oprot->writeString((*_iter68)); + xfer += oprot->writeString((*_iter66)); } - xfer += oprot->writeSetEnd(); + xfer += oprot->writeListEnd(); } xfer += oprot->writeFieldEnd(); } @@ -1819,10 +1817,10 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol xfer += oprot->writeFieldBegin("batchQueues", ::apache::thrift::protocol::T_LIST, 6); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->batchQueues.size())); - std::vector<BatchQueue> ::const_iterator _iter69; - for (_iter69 = this->batchQueues.begin(); _iter69 != this->batchQueues.end(); ++_iter69) + std::vector<BatchQueue> ::const_iterator _iter67; + for (_iter67 = this->batchQueues.begin(); _iter67 != this->batchQueues.end(); ++_iter67) { - xfer += (*_iter69).write(oprot); + xfer += (*_iter67).write(oprot); } xfer += oprot->writeListEnd(); } @@ -1832,11 +1830,11 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol xfer += oprot->writeFieldBegin("fileSystems", ::apache::thrift::protocol::T_MAP, 7); { xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->fileSystems.size())); - std::map<FileSystems::type, std::string> ::const_iterator _iter70; - for (_iter70 = this->fileSystems.begin(); _iter70 != this->fileSystems.end(); ++_iter70) + std::map<FileSystems::type, std::string> ::const_iterator _iter68; + for (_iter68 = this->fileSystems.begin(); _iter68 != this->fileSystems.end(); ++_iter68) { - xfer += oprot->writeI32((int32_t)_iter70->first); - xfer += oprot->writeString(_iter70->second); + xfer += oprot->writeI32((int32_t)_iter68->first); + xfer += oprot->writeString(_iter68->second); } xfer += oprot->writeMapEnd(); } @@ -1846,10 +1844,10 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol xfer += oprot->writeFieldBegin("jobSubmissionInterfaces", ::apache::thrift::protocol::T_LIST, 8); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->jobSubmissionInterfaces.size())); - std::vector<JobSubmissionInterface> ::const_iterator _iter71; - for (_iter71 = this->jobSubmissionInterfaces.begin(); _iter71 != this->jobSubmissionInterfaces.end(); ++_iter71) + std::vector<JobSubmissionInterface> ::const_iterator _iter69; + for (_iter69 = this->jobSubmissionInterfaces.begin(); _iter69 != this->jobSubmissionInterfaces.end(); ++_iter69) { - xfer += (*_iter71).write(oprot); + xfer += (*_iter69).write(oprot); } xfer += oprot->writeListEnd(); } @@ -1859,10 +1857,10 @@ uint32_t ComputeResourceDescription::write(::apache::thrift::protocol::TProtocol xfer += oprot->writeFieldBegin("dataMovementInterfaces", ::apache::thrift::protocol::T_LIST, 9); { xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->dataMovementInterfaces.size())); - std::vector<DataMovementInterface> ::const_iterator _iter72; - for (_iter72 = this->dataMovementInterfaces.begin(); _iter72 != this->dataMovementInterfaces.end(); ++_iter72) + std::vector<DataMovementInterface> ::const_iterator _iter70; + for (_iter70 = this->dataMovementInterfaces.begin(); _iter70 != this->dataMovementInterfaces.end(); ++_iter70) { - xfer += (*_iter72).write(oprot); + xfer += (*_iter70).write(oprot); } xfer += oprot->writeListEnd(); } http://git-wip-us.apache.org/repos/asf/airavata/blob/b95e9206/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.h ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.h index 81af83f..c69be3f 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/computeResourceModel_types.h @@ -927,8 +927,8 @@ typedef struct _ComputeResourceDescription__isset { class ComputeResourceDescription { public: - static const char* ascii_fingerprint; // = "2CAAC3134218EFF83D46106C39BECE65"; - static const uint8_t binary_fingerprint[16]; // = {0x2C,0xAA,0xC3,0x13,0x42,0x18,0xEF,0xF8,0x3D,0x46,0x10,0x6C,0x39,0xBE,0xCE,0x65}; + static const char* ascii_fingerprint; // = "CA924FC1A07D7956848B049D2CACF3EC"; + static const uint8_t binary_fingerprint[16]; // = {0xCA,0x92,0x4F,0xC1,0xA0,0x7D,0x79,0x56,0x84,0x8B,0x04,0x9D,0x2C,0xAC,0xF3,0xEC}; ComputeResourceDescription() : computeResourceId("DO_NOT_SET_AT_CLIENTS"), hostName(), resourceDescription() { } @@ -937,8 +937,8 @@ class ComputeResourceDescription { std::string computeResourceId; std::string hostName; - std::set<std::string> hostAliases; - std::set<std::string> ipAddresses; + std::vector<std::string> hostAliases; + std::vector<std::string> ipAddresses; std::string resourceDescription; std::vector<BatchQueue> batchQueues; std::map<FileSystems::type, std::string> fileSystems; @@ -955,12 +955,12 @@ class ComputeResourceDescription { hostName = val; } - void __set_hostAliases(const std::set<std::string> & val) { + void __set_hostAliases(const std::vector<std::string> & val) { hostAliases = val; __isset.hostAliases = true; } - void __set_ipAddresses(const std::set<std::string> & val) { + void __set_ipAddresses(const std::vector<std::string> & val) { ipAddresses = val; __isset.ipAddresses = true; } http://git-wip-us.apache.org/repos/asf/airavata/blob/b95e9206/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php index 7f52308..68addd1 100644 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php +++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php @@ -1858,7 +1858,7 @@ class ComputeResourceDescription { ), 3 => array( 'var' => 'hostAliases', - 'type' => TType::SET, + 'type' => TType::LST, 'etype' => TType::STRING, 'elem' => array( 'type' => TType::STRING, @@ -1866,7 +1866,7 @@ class ComputeResourceDescription { ), 4 => array( 'var' => 'ipAddresses', - 'type' => TType::SET, + 'type' => TType::LST, 'etype' => TType::STRING, 'elem' => array( 'type' => TType::STRING, @@ -1982,43 +1982,35 @@ class ComputeResourceDescription { } break; case 3: - if ($ftype == TType::SET) { + if ($ftype == TType::LST) { $this->hostAliases = array(); $_size23 = 0; $_etype26 = 0; - $xfer += $input->readSetBegin($_etype26, $_size23); + $xfer += $input->readListBegin($_etype26, $_size23); for ($_i27 = 0; $_i27 < $_size23; ++$_i27) { $elem28 = null; $xfer += $input->readString($elem28); - if (is_scalar($elem28)) { - $this->hostAliases[$elem28] = true; - } else { - $this->hostAliases []= $elem28; - } + $this->hostAliases []= $elem28; } - $xfer += $input->readSetEnd(); + $xfer += $input->readListEnd(); } else { $xfer += $input->skip($ftype); } break; case 4: - if ($ftype == TType::SET) { + if ($ftype == TType::LST) { $this->ipAddresses = array(); $_size29 = 0; $_etype32 = 0; - $xfer += $input->readSetBegin($_etype32, $_size29); + $xfer += $input->readListBegin($_etype32, $_size29); for ($_i33 = 0; $_i33 < $_size29; ++$_i33) { $elem34 = null; $xfer += $input->readString($elem34); - if (is_scalar($elem34)) { - $this->ipAddresses[$elem34] = true; - } else { - $this->ipAddresses []= $elem34; - } + $this->ipAddresses []= $elem34; } - $xfer += $input->readSetEnd(); + $xfer += $input->readListEnd(); } else { $xfer += $input->skip($ftype); } @@ -2131,20 +2123,16 @@ class ComputeResourceDescription { if (!is_array($this->hostAliases)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('hostAliases', TType::SET, 3); + $xfer += $output->writeFieldBegin('hostAliases', TType::LST, 3); { - $output->writeSetBegin(TType::STRING, count($this->hostAliases)); + $output->writeListBegin(TType::STRING, count($this->hostAliases)); { - foreach ($this->hostAliases as $iter60 => $iter61) + foreach ($this->hostAliases as $iter60) { - if (is_scalar($iter61)) { $xfer += $output->writeString($iter60); - } else { - $xfer += $output->writeString($iter61); - } } } - $output->writeSetEnd(); + $output->writeListEnd(); } $xfer += $output->writeFieldEnd(); } @@ -2152,20 +2140,16 @@ class ComputeResourceDescription { if (!is_array($this->ipAddresses)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('ipAddresses', TType::SET, 4); + $xfer += $output->writeFieldBegin('ipAddresses', TType::LST, 4); { - $output->writeSetBegin(TType::STRING, count($this->ipAddresses)); + $output->writeListBegin(TType::STRING, count($this->ipAddresses)); { - foreach ($this->ipAddresses as $iter62 => $iter63) + foreach ($this->ipAddresses as $iter61) { - if (is_scalar($iter63)) { - $xfer += $output->writeString($iter62); - } else { - $xfer += $output->writeString($iter63); - } + $xfer += $output->writeString($iter61); } } - $output->writeSetEnd(); + $output->writeListEnd(); } $xfer += $output->writeFieldEnd(); } @@ -2182,9 +2166,9 @@ class ComputeResourceDescription { { $output->writeListBegin(TType::STRUCT, count($this->batchQueues)); { - foreach ($this->batchQueues as $iter64) + foreach ($this->batchQueues as $iter62) { - $xfer += $iter64->write($output); + $xfer += $iter62->write($output); } } $output->writeListEnd(); @@ -2199,10 +2183,10 @@ class ComputeResourceDescription { { $output->writeMapBegin(TType::I32, TType::STRING, count($this->fileSystems)); { - foreach ($this->fileSystems as $kiter65 => $viter66) + foreach ($this->fileSystems as $kiter63 => $viter64) { - $xfer += $output->writeI32($kiter65); - $xfer += $output->writeString($viter66); + $xfer += $output->writeI32($kiter63); + $xfer += $output->writeString($viter64); } } $output->writeMapEnd(); @@ -2217,9 +2201,9 @@ class ComputeResourceDescription { { $output->writeListBegin(TType::STRUCT, count($this->jobSubmissionInterfaces)); { - foreach ($this->jobSubmissionInterfaces as $iter67) + foreach ($this->jobSubmissionInterfaces as $iter65) { - $xfer += $iter67->write($output); + $xfer += $iter65->write($output); } } $output->writeListEnd(); @@ -2234,9 +2218,9 @@ class ComputeResourceDescription { { $output->writeListBegin(TType::STRUCT, count($this->dataMovementInterfaces)); { - foreach ($this->dataMovementInterfaces as $iter68) + foreach ($this->dataMovementInterfaces as $iter66) { - $xfer += $iter68->write($output); + $xfer += $iter66->write($output); } } $output->writeListEnd(); http://git-wip-us.apache.org/repos/asf/airavata/blob/b95e9206/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java index c40ac35..2845bc6 100644 --- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java +++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java @@ -70,7 +70,7 @@ public class CreateLaunchExperiment { public static void main(String[] args) throws Exception { airavataClient = AiravataClientFactory.createAiravataClient(THRIFT_SERVER_HOST, THRIFT_SERVER_PORT); System.out.println("API version is " + airavataClient.getAPIVersion()); -// registerApplications(); // run this only the first time + registerApplications(); // run this only the first time createAndLaunchExp(); } http://git-wip-us.apache.org/repos/asf/airavata/blob/b95e9206/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java index 83cd33b..bd4023b 100644 --- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java +++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplications.java @@ -24,11 +24,7 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; +import java.util.*; import org.apache.airavata.api.Airavata; import org.apache.airavata.api.client.AiravataClientFactory; @@ -124,23 +120,25 @@ public class RegisterSampleApplications { RegisterSampleApplications registerSampleApplications = new RegisterSampleApplications(airavataClient); + registerLocalHost(); //Register all compute hosts - registerSampleApplications.registerXSEDEHosts(); +// registerSampleApplications.registerXSEDEHosts(); + //Register Gateway Resource Preferences - registerSampleApplications.registerGatewayResourceProfile(); +// registerSampleApplications.registerGatewayResourceProfile(); //Register all application modules - registerSampleApplications.registerAppModules(); +// registerSampleApplications.registerAppModules(); //Register all application deployments - registerSampleApplications.registerAppDeployments(); +// registerSampleApplications.registerAppDeployments(); //Register all application interfaces - registerSampleApplications.registerAppInterfaces(); +// registerSampleApplications.registerAppInterfaces(); //write output into propertiesFile - registerSampleApplications.writeIdPropertyFile(); +// registerSampleApplications.writeIdPropertyFile(); } catch (Exception e) { logger.error("Error while connecting with server", e.getMessage()); @@ -148,12 +146,16 @@ public class RegisterSampleApplications { } } - public void registerLocalHost() { + public static void registerLocalHost() { try { System.out.println("\n #### Registering Localhost Computational Resource #### \n"); ComputeResourceDescription computeResourceDescription = RegisterSampleApplicationsUtils. createComputeResourceDescription("localhost", "LocalHost", null, null); + List<String> hostAliases = new ArrayList<String>(); + hostAliases.add("alias1"); + hostAliases.add("alias2"); + computeResourceDescription.setHostAliases(hostAliases); localhostId = airavataClient.registerComputeResource(computeResourceDescription); ResourceJobManager resourceJobManager = RegisterSampleApplicationsUtils. createResourceJobManager(ResourceJobManagerType.FORK, null, null, null); http://git-wip-us.apache.org/repos/asf/airavata/blob/b95e9206/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java index 59e0f79..57bcc27 100644 --- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java +++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/tools/RegisterSampleApplicationsUtils.java @@ -97,7 +97,7 @@ public class RegisterSampleApplicationsUtils { } public static ComputeResourceDescription createComputeResourceDescription( - String hostName, String hostDesc, Set<String> hostAliases, Set<String> ipAddresses) { + String hostName, String hostDesc, List<String> hostAliases, List<String> ipAddresses) { ComputeResourceDescription host = new ComputeResourceDescription(); host.setHostName(hostName); host.setResourceDescription(hostDesc); http://git-wip-us.apache.org/repos/asf/airavata/blob/b95e9206/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java index a3f0502..90c4a37 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ComputeResourceDescription.java @@ -83,8 +83,8 @@ import org.slf4j.LoggerFactory; private static final org.apache.thrift.protocol.TField COMPUTE_RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("computeResourceId", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField HOST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("hostName", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField HOST_ALIASES_FIELD_DESC = new org.apache.thrift.protocol.TField("hostAliases", org.apache.thrift.protocol.TType.SET, (short)3); - private static final org.apache.thrift.protocol.TField IP_ADDRESSES_FIELD_DESC = new org.apache.thrift.protocol.TField("ipAddresses", org.apache.thrift.protocol.TType.SET, (short)4); + private static final org.apache.thrift.protocol.TField HOST_ALIASES_FIELD_DESC = new org.apache.thrift.protocol.TField("hostAliases", org.apache.thrift.protocol.TType.LIST, (short)3); + private static final org.apache.thrift.protocol.TField IP_ADDRESSES_FIELD_DESC = new org.apache.thrift.protocol.TField("ipAddresses", org.apache.thrift.protocol.TType.LIST, (short)4); private static final org.apache.thrift.protocol.TField RESOURCE_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceDescription", org.apache.thrift.protocol.TType.STRING, (short)5); private static final org.apache.thrift.protocol.TField BATCH_QUEUES_FIELD_DESC = new org.apache.thrift.protocol.TField("batchQueues", org.apache.thrift.protocol.TType.LIST, (short)6); private static final org.apache.thrift.protocol.TField FILE_SYSTEMS_FIELD_DESC = new org.apache.thrift.protocol.TField("fileSystems", org.apache.thrift.protocol.TType.MAP, (short)7); @@ -99,8 +99,8 @@ import org.slf4j.LoggerFactory; private String computeResourceId; // required private String hostName; // required - private Set<String> hostAliases; // optional - private Set<String> ipAddresses; // optional + private List<String> hostAliases; // optional + private List<String> ipAddresses; // optional private String resourceDescription; // optional private List<BatchQueue> batchQueues; // optional private Map<FileSystems,String> fileSystems; // optional @@ -199,10 +199,10 @@ import org.slf4j.LoggerFactory; tmpMap.put(_Fields.HOST_NAME, new org.apache.thrift.meta_data.FieldMetaData("hostName", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.HOST_ALIASES, new org.apache.thrift.meta_data.FieldMetaData("hostAliases", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); tmpMap.put(_Fields.IP_ADDRESSES, new org.apache.thrift.meta_data.FieldMetaData("ipAddresses", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET, + new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); tmpMap.put(_Fields.RESOURCE_DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("resourceDescription", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); @@ -248,11 +248,11 @@ import org.slf4j.LoggerFactory; this.hostName = other.hostName; } if (other.isSetHostAliases()) { - Set<String> __this__hostAliases = new HashSet<String>(other.hostAliases); + List<String> __this__hostAliases = new ArrayList<String>(other.hostAliases); this.hostAliases = __this__hostAliases; } if (other.isSetIpAddresses()) { - Set<String> __this__ipAddresses = new HashSet<String>(other.ipAddresses); + List<String> __this__ipAddresses = new ArrayList<String>(other.ipAddresses); this.ipAddresses = __this__ipAddresses; } if (other.isSetResourceDescription()) { @@ -370,16 +370,16 @@ import org.slf4j.LoggerFactory; public void addToHostAliases(String elem) { if (this.hostAliases == null) { - this.hostAliases = new HashSet<String>(); + this.hostAliases = new ArrayList<String>(); } this.hostAliases.add(elem); } - public Set<String> getHostAliases() { + public List<String> getHostAliases() { return this.hostAliases; } - public void setHostAliases(Set<String> hostAliases) { + public void setHostAliases(List<String> hostAliases) { this.hostAliases = hostAliases; } @@ -408,16 +408,16 @@ import org.slf4j.LoggerFactory; public void addToIpAddresses(String elem) { if (this.ipAddresses == null) { - this.ipAddresses = new HashSet<String>(); + this.ipAddresses = new ArrayList<String>(); } this.ipAddresses.add(elem); } - public Set<String> getIpAddresses() { + public List<String> getIpAddresses() { return this.ipAddresses; } - public void setIpAddresses(Set<String> ipAddresses) { + public void setIpAddresses(List<String> ipAddresses) { this.ipAddresses = ipAddresses; } @@ -629,7 +629,7 @@ import org.slf4j.LoggerFactory; if (value == null) { unsetHostAliases(); } else { - setHostAliases((Set<String>)value); + setHostAliases((List<String>)value); } break; @@ -637,7 +637,7 @@ import org.slf4j.LoggerFactory; if (value == null) { unsetIpAddresses(); } else { - setIpAddresses((Set<String>)value); + setIpAddresses((List<String>)value); } break; @@ -1119,17 +1119,17 @@ import org.slf4j.LoggerFactory; } break; case 3: // HOST_ALIASES - if (schemeField.type == org.apache.thrift.protocol.TType.SET) { + if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TSet _set26 = iprot.readSetBegin(); - struct.hostAliases = new HashSet<String>(2*_set26.size); - for (int _i27 = 0; _i27 < _set26.size; ++_i27) + org.apache.thrift.protocol.TList _list26 = iprot.readListBegin(); + struct.hostAliases = new ArrayList<String>(_list26.size); + for (int _i27 = 0; _i27 < _list26.size; ++_i27) { String _elem28; _elem28 = iprot.readString(); struct.hostAliases.add(_elem28); } - iprot.readSetEnd(); + iprot.readListEnd(); } struct.setHostAliasesIsSet(true); } else { @@ -1137,17 +1137,17 @@ import org.slf4j.LoggerFactory; } break; case 4: // IP_ADDRESSES - if (schemeField.type == org.apache.thrift.protocol.TType.SET) { + if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TSet _set29 = iprot.readSetBegin(); - struct.ipAddresses = new HashSet<String>(2*_set29.size); - for (int _i30 = 0; _i30 < _set29.size; ++_i30) + org.apache.thrift.protocol.TList _list29 = iprot.readListBegin(); + struct.ipAddresses = new ArrayList<String>(_list29.size); + for (int _i30 = 0; _i30 < _list29.size; ++_i30) { String _elem31; _elem31 = iprot.readString(); struct.ipAddresses.add(_elem31); } - iprot.readSetEnd(); + iprot.readListEnd(); } struct.setIpAddressesIsSet(true); } else { @@ -1266,12 +1266,12 @@ import org.slf4j.LoggerFactory; if (struct.isSetHostAliases()) { oprot.writeFieldBegin(HOST_ALIASES_FIELD_DESC); { - oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.hostAliases.size())); + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.hostAliases.size())); for (String _iter45 : struct.hostAliases) { oprot.writeString(_iter45); } - oprot.writeSetEnd(); + oprot.writeListEnd(); } oprot.writeFieldEnd(); } @@ -1280,12 +1280,12 @@ import org.slf4j.LoggerFactory; if (struct.isSetIpAddresses()) { oprot.writeFieldBegin(IP_ADDRESSES_FIELD_DESC); { - oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.ipAddresses.size())); + oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.ipAddresses.size())); for (String _iter46 : struct.ipAddresses) { oprot.writeString(_iter46); } - oprot.writeSetEnd(); + oprot.writeListEnd(); } oprot.writeFieldEnd(); } @@ -1466,9 +1466,9 @@ import org.slf4j.LoggerFactory; BitSet incoming = iprot.readBitSet(7); if (incoming.get(0)) { { - org.apache.thrift.protocol.TSet _set57 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.hostAliases = new HashSet<String>(2*_set57.size); - for (int _i58 = 0; _i58 < _set57.size; ++_i58) + org.apache.thrift.protocol.TList _list57 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.hostAliases = new ArrayList<String>(_list57.size); + for (int _i58 = 0; _i58 < _list57.size; ++_i58) { String _elem59; _elem59 = iprot.readString(); @@ -1479,9 +1479,9 @@ import org.slf4j.LoggerFactory; } if (incoming.get(1)) { { - org.apache.thrift.protocol.TSet _set60 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.ipAddresses = new HashSet<String>(2*_set60.size); - for (int _i61 = 0; _i61 < _set60.size; ++_i61) + org.apache.thrift.protocol.TList _list60 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.ipAddresses = new ArrayList<String>(_list60.size); + for (int _i61 = 0; _i61 < _list60.size; ++_i61) { String _elem62; _elem62 = iprot.readString(); http://git-wip-us.apache.org/repos/asf/airavata/blob/b95e9206/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift ---------------------------------------------------------------------- diff --git a/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift b/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift index 0046beb..62ebfe5 100644 --- a/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift +++ b/airavata-api/thrift-interface-descriptions/computeResourceModel.thrift @@ -411,8 +411,8 @@ struct ComputeResourceDescription { // 1: required bool isEmpty = 0, 1: required string computeResourceId = DEFAULT_ID, 2: required string hostName, - 3: optional set<string> hostAliases, - 4: optional set<string> ipAddresses, + 3: optional list<string> hostAliases, + 4: optional list<string> ipAddresses, 5: optional string resourceDescription, 6: optional list<BatchQueue> batchQueues, 7: optional map<FileSystems, string> fileSystems, http://git-wip-us.apache.org/repos/asf/airavata/blob/b95e9206/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java ---------------------------------------------------------------------- diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java index bf1a08e..6e5e707 100644 --- a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java +++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorNew.java @@ -74,7 +74,7 @@ public class DocumentCreatorNew { public String createLocalHostDocs() throws AppCatalogException, InvalidRequestException, AiravataClientException, AiravataSystemException, TException { //Define compute resource host ComputeResourceDescription host = DocumentCreatorUtils.createComputeResourceDescription( - "localhost", new HashSet<String>(Arrays.asList(new String[]{"127.0.0.1"})), new HashSet<String>(Arrays.asList(new String[]{"127.0.0.1"}))); + "localhost", new ArrayList<String>(Arrays.asList(new String[]{"127.0.0.1"})), new ArrayList<String>(Arrays.asList(new String[]{"127.0.0.1"}))); // host.setIsEmpty(true); host.setComputeResourceId(client.registerComputeResource(host)); http://git-wip-us.apache.org/repos/asf/airavata/blob/b95e9206/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorUtils.java ---------------------------------------------------------------------- diff --git a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorUtils.java b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorUtils.java index 19e7e23..e6fcb7d 100644 --- a/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorUtils.java +++ b/modules/airavata-client/src/main/java/org/apache/airavata/client/tools/DocumentCreatorUtils.java @@ -21,6 +21,7 @@ package org.apache.airavata.client.tools; +import java.util.List; import java.util.Map; import java.util.Set; @@ -104,7 +105,7 @@ public class DocumentCreatorUtils { } public static ComputeResourceDescription createComputeResourceDescription( - String hostName, Set<String> hostAliases, Set<String> ipAddresses) { + String hostName, List<String> hostAliases, List<String> ipAddresses) { ComputeResourceDescription host = new ComputeResourceDescription(); host.setHostName(hostName); host.setIpAddresses(ipAddresses); http://git-wip-us.apache.org/repos/asf/airavata/blob/b95e9206/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java index 4807f04..023c103 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java @@ -131,7 +131,7 @@ public class ComputeResourceImpl implements ComputeResource { protected void saveIpAddresses(ComputeResourceDescription description, ComputeResourceResource computeHostResource) throws AppCatalogException { - Set<String> ipAddresses = description.getIpAddresses(); + List<String> ipAddresses = description.getIpAddresses(); if (ipAddresses != null && !ipAddresses.isEmpty()) { for (String ipAddress : ipAddresses) { HostIPAddressResource ipAddressResource = new HostIPAddressResource(); @@ -146,13 +146,13 @@ public class ComputeResourceImpl implements ComputeResource { protected void saveHostAliases(ComputeResourceDescription description, ComputeResourceResource computeHostResource) throws AppCatalogException { - Set<String> hostAliases = description.getHostAliases(); + List<String> hostAliases = description.getHostAliases(); if (hostAliases != null && !hostAliases.isEmpty()) { for (String alias : hostAliases) { HostAliasResource aliasResource = new HostAliasResource(); aliasResource.setComputeHostResource(computeHostResource); aliasResource.setResourceID(computeHostResource.getResourceId()); - aliasResource.setAlias(alias); + aliasResource.setAlias(alias); aliasResource.save(); } } http://git-wip-us.apache.org/repos/asf/airavata/blob/b95e9206/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java index 352e1c8..05cfa11 100644 --- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java +++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/util/AppCatalogThriftConversion.java @@ -101,16 +101,16 @@ public class AppCatalogThriftConversion { return list; } - public static Set<String> getHostAliases (List<Resource> resources){ - Set<String> hostAliases = new HashSet<String>(); + public static List<String> getHostAliases (List<Resource> resources){ + List<String> hostAliases = new ArrayList<String>(); for (Resource alias : resources){ hostAliases.add(((HostAliasResource)alias).getAlias()); } return hostAliases; } - public static Set<String> getIpAddresses (List<Resource> resources){ - Set<String> hostIpAddresses = new HashSet<String>(); + public static List<String> getIpAddresses (List<Resource> resources){ + List<String> hostIpAddresses = new ArrayList<String>(); for (Resource resource : resources){ hostIpAddresses.add(((HostIPAddressResource)resource).getIpaddress()); } http://git-wip-us.apache.org/repos/asf/airavata/blob/b95e9206/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java ---------------------------------------------------------------------- diff --git a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java index 79fb9ff..296478c 100644 --- a/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java +++ b/modules/app-catalog/app-catalog-data/src/test/java/org/apache/airavata/app/catalog/test/ComputeResourceTest.java @@ -69,11 +69,11 @@ public class ComputeResourceTest { description.setHostName("localhost"); description.setResourceDescription("test compute resource"); - Set<String> ipdaresses = new HashSet<String>(); + List<String> ipdaresses = new ArrayList<String>(); ipdaresses.add("222.33.43.444"); ipdaresses.add("23.344.44.454"); description.setIpAddresses(ipdaresses); - Set<String> aliases = new HashSet<String>(); + List<String> aliases = new ArrayList<String>(); aliases.add("test.alias1"); aliases.add("test.alias2"); description.setHostAliases(aliases); @@ -143,6 +143,11 @@ public class ComputeResourceTest { ComputeResourceDescription host = null; if (computeResource.isComputeResourceExists(resourceId)){ host = computeResource.getComputeResource(resourceId); + List<String> hostAliases = host.getHostAliases(); + for (String alias : hostAliases){ + System.out.println("%%%%%%%%%%%%%%%% alias value : %%%%%%%%%%%%%%%%%%% : " + alias); + } + System.out.println("**********Resource name ************* : " + host.getHostName()); } http://git-wip-us.apache.org/repos/asf/airavata/blob/b95e9206/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorNew.java ---------------------------------------------------------------------- diff --git a/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorNew.java b/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorNew.java index 7f8ab57..2d833de 100644 --- a/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorNew.java +++ b/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorNew.java @@ -46,12 +46,7 @@ import org.apache.airavata.model.error.InvalidRequestException; import org.apache.thrift.TException; import java.io.File; -import java.util.Arrays; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.UUID; +import java.util.*; public class DocumentCreatorNew { @@ -83,7 +78,7 @@ public class DocumentCreatorNew { public String createLocalHostDocs() throws AppCatalogException, InvalidRequestException, AiravataClientException, AiravataSystemException, TException { //Define compute resource host ComputeResourceDescription host = DocumentCreatorUtils.createComputeResourceDescription( - "localhost", new HashSet<String>(Arrays.asList(new String[]{"127.0.0.1"})), new HashSet<String>(Arrays.asList(new String[]{"127.0.0.1"}))); + "localhost", new ArrayList<String>(Arrays.asList(new String[]{"127.0.0.1"})), new ArrayList<String>(Arrays.asList(new String[]{"127.0.0.1"}))); // host.setIsEmpty(true); host.setComputeResourceId(client.registerComputeResource(host)); http://git-wip-us.apache.org/repos/asf/airavata/blob/b95e9206/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorUtils.java ---------------------------------------------------------------------- diff --git a/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorUtils.java b/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorUtils.java index 7805d1f..3cfff87 100644 --- a/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorUtils.java +++ b/modules/integration-tests/src/test/java/org/apache/airavata/integration/tools/DocumentCreatorUtils.java @@ -37,6 +37,7 @@ import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManager; import org.apache.airavata.model.appcatalog.computeresource.ResourceJobManagerType; import org.apache.airavata.model.appcatalog.gatewayprofile.ComputeResourcePreference; +import java.util.List; import java.util.Map; import java.util.Set; @@ -100,7 +101,7 @@ public class DocumentCreatorUtils { } public static ComputeResourceDescription createComputeResourceDescription( - String hostName, Set<String> hostAliases, Set<String> ipAddresses) { + String hostName, List<String> hostAliases, List<String> ipAddresses) { ComputeResourceDescription host = new ComputeResourceDescription(); host.setHostName(hostName); host.setIpAddresses(ipAddresses);
