The code.ill.fr has been recreated and upgraded with the latest version this weekend, If you encounter any problem please inform the Helpdesk.

Commit 7a7d5a79 authored by legoc's avatar legoc
Browse files

(split) Renamed Port application names

parent 3bec52f5
......@@ -587,16 +587,16 @@ class Port {
friend std::ostream& operator<<(std::ostream&, const Port&);
public:
Port(int port, const std::string& status, const std::string& application);
Port(int port, const std::string& status, const std::string& owner);
int getPort() const;
const std::string& getStatus() const;
const std::string& getApplication() const;
const std::string& getOwner() const;
private:
int m_port;
std::string m_status;
std::string m_application;
std::string m_owner;
};
std::string toString(cameo::application::State applicationStates);
......
......@@ -94,7 +94,7 @@ public:
/**
* throws ConnectionTimeout
*/
std::vector<application::Port> getApplicationPorts() const;
std::vector<application::Port> getPorts() const;
/**
* throws ConnectionTimeout
......
......@@ -1252,10 +1252,10 @@ int Info::getPid() const {
///////////////////////////////////////////////////////////////////////////
// Port
Port::Port(int port, const std::string& status, const std::string& application) :
Port::Port(int port, const std::string& status, const std::string& owner) :
m_port(port),
m_status(status),
m_application(application) {
m_owner(owner) {
}
int Port::getPort() const {
......@@ -1266,8 +1266,8 @@ const std::string& Port::getStatus() const {
return m_status;
}
const std::string& Port::getApplication() const {
return m_application;
const std::string& Port::getOwner() const {
return m_owner;
}
std::string toString(cameo::application::State applicationStates) {
......@@ -1420,7 +1420,7 @@ std::ostream& operator<<(std::ostream& os, const application::Port& port) {
os << "[port=" << port.m_port
<< ", status=" << port.m_status
<< ", application=" << port.m_application << "]";
<< ", owner=" << port.m_owner << "]";
return os;
}
......
......@@ -426,7 +426,7 @@ std::vector<application::Info> Server::getApplicationInfos(const std::string& na
return infos;
}
std::vector<application::Port> Server::getApplicationPorts() const {
std::vector<application::Port> Server::getPorts() const {
vector<application::Port> ports;
......@@ -445,9 +445,9 @@ std::vector<application::Port> Server::getApplicationPorts() const {
int port = info[message::PortInfo::PORT].GetInt();
string status = info[message::PortInfo::STATUS].GetString();
string application = info[message::PortInfo::APPLICATION].GetString();
string owner = info[message::PortInfo::OWNER].GetString();
application::Port portInfo(port, status, application);
application::Port portInfo(port, status, owner);
ports.push_back(portInfo);
}
......
......@@ -302,7 +302,7 @@ namespace message {
namespace PortInfo {
constexpr const char* PORT = "port"; // int32
constexpr const char* STATUS = "status"; // string
constexpr const char* APPLICATION = "application"; // string
constexpr const char* OWNER = "owner"; // string
}
namespace PortInfoListResponse {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment