std::vector<SimulatorSingleResourceSP> g_singleResources;
std::vector<SimulatorCollectionResourceSP> g_collectionResources;
-std::string getPropertyTypeString(SimulatorResourceModel::AttributeProperty::Type type)
-{
- switch(type)
- {
- case SimulatorResourceModel::AttributeProperty::Type::RANGE:
- return "RANGE";
- case SimulatorResourceModel::AttributeProperty::Type::VALUE_SET:
- return "VALUE_SET";
- default:
- break;
- }
-
- return "UNKNOWN";
-}
-
class AppLogger : public ILogger
{
public:
}
int index = 1;
- for (auto & resource : g_singleResources)
+ for (auto &resource : g_singleResources)
{
std::cout << index++ << ": " << resource->getURI().c_str() << std::endl;
}
try
{
// Resource model change callback
- SimulatorResource::ResourceModelChangedCallback modelChangeCB =
- [](const std::string &uri, SimulatorResourceModel &resModel)
+ SimulatorResource::ResourceModelUpdateCallback modelChangeCB =
+ [](const std::string & uri, const SimulatorResourceModel & resModel)
{
std::cout << "[callback] Resource model is changed URI: " << uri.c_str() << std::endl;
std::cout << "#### Modified attributes are ####" << std::endl;
std::cout << "#### Updated resource model ####" << std::endl;
- std::cout << resModel.toString() << std::endl;
+ std::cout << resModel.asString() << std::endl;
std::cout << "########################" << std::endl;
};
// Observer added/removed callback
SimulatorResource::ObserverCallback observerCB =
- [] (const std::string &uri, ObservationStatus state, const ObserverInfo &observerInfo)
+ [] (const std::string & uri, ObservationStatus state, const ObserverInfo & observerInfo)
{
std::cout << "[callback] Observer notification received..." << uri << std::endl;
out << "ID: " << (int) observerInfo.id << std::endl;
out << " [address: " << observerInfo.address << " port: " << observerInfo.port
<< "]" << std::endl;
+ out << "State: " << ((state == ObservationStatus::REGISTER) ? "REGISTER" : "UNREGISTER") <<
+ std::endl;
std::cout << out.str();
};
// Get the RAML file path from user
std::string configPath;
std::cout << "Enter RAML path: ";
- std::cin>>configPath;
+ std::cin >> configPath;
SimulatorResourceSP resource =
SimulatorManager::getInstance()->createResource(configPath);
std::cout << "Resource type: " << resource->getResourceType() << std::endl;
std::cout << "Interface type:";
for (auto &interfaceType : resource->getInterface())
- std::cout << " " << interfaceType;
+ std::cout << " " << interfaceType << std::endl;
// Attributes
- SimulatorResourceModel resModel = resource->getResourceModel();
- std::map<std::string, SimulatorResourceModel::Attribute> attributes =
- resModel.getAttributes();
- std::cout << "##### Attributes [" << attributes.size() << "]" << std::endl;
- for (auto & attribute : attributes)
- {
- std::cout << (attribute.second).getName() << " : {" << std::endl;
- std::cout << "value: " << (attribute.second).toString() << std::endl;
- SimulatorResourceModel::AttributeProperty prop = (attribute.second).getProperty();
- std::cout << "Supported values given by : " << getPropertyTypeString(prop.type()) << std::endl;
- if (SimulatorResourceModel::AttributeProperty::Type::RANGE == prop.type())
- {
- std::cout << "Min: " << prop.min() << std::endl;
- std::cout << "Max: " << prop.max() << std::endl;
- }
- else if (SimulatorResourceModel::AttributeProperty::Type::VALUE_SET == prop.type())
- {
- std::cout << "Value set: " << prop.valueSetToString() << std::endl;
- }
-
- std::cout << "}" << std::endl << std::endl;
- }
+ std::cout << "##### Representation #####" << std::endl;
+ std::cout << resource->getResourceModel().asString() << std::endl;
std::cout << "#############################" << std::endl;
}
void automateResourceUpdate()
{
- updateCompleteCallback callback = [](const std::string &uri, const int id)
+ SimulatorSingleResource::AutoUpdateCompleteCallback callback =
+ [](const std::string & uri, const int id)
{
std::cout << "Update automation is completed [URI: " << uri
<< " AutomationID: " << id << "] ###" << std::endl;
if (-1 == index)
return;
- AutomationType type = AutomationType::NORMAL;
+ AutoUpdateType type = AutoUpdateType::ONE_TIME;
int choice = 0;
std::cout << "Press 1 if you want recurrent automation: ";
std::cin >> choice;
if (1 == choice)
- type = AutomationType::RECURRENT;
+ type = AutoUpdateType::REPEAT;
try
{
void automateAttributeUpdate()
{
- updateCompleteCallback callback = [](const std::string &uri, const int id)
+ SimulatorSingleResource::AutoUpdateCompleteCallback callback =
+ [](const std::string & uri, const int id)
{
std::cout << "Update automation is completed [URI: " << uri
<< " AutomationID: " << id << "] ###" << std::endl;
return;
SimulatorSingleResourceSP resource = g_singleResources[index - 1];
- SimulatorResourceModel resModel = resource->getResourceModel();
- std::map<std::string, SimulatorResourceModel::Attribute> attributes =
- resModel.getAttributes();
+ std::map<std::string, SimulatorResourceAttribute> attributes =
+ resource->getAttributes();
int size = 0;
- for (auto & attribute : attributes)
+ for (auto &attributeEntry : attributes)
{
- std::cout << ++size << ": " << attribute.first.c_str() << std::endl;
+ std::cout << ++size << ": " << attributeEntry.first << std::endl;
}
if (0 == size)
int count = 0;
std::string attributeName;
- for (auto & attribute : attributes)
+ for (auto &attributeEntry : attributes)
{
if (count == choice - 1)
{
- attributeName = attribute.first;
+ attributeName = attributeEntry.first;
break;
}
count++;
}
- AutomationType type = AutomationType::NORMAL;
+ AutoUpdateType type = AutoUpdateType::ONE_TIME;
std::cout << "Press 1 if you want recurrent automation: ";
std::cin >> choice;
if (1 == choice)
- type = AutomationType::RECURRENT;
+ type = AutoUpdateType::REPEAT;
std::cout << "Requesting attribute automation for " << attributeName <<
std::endl;
try
{
-
int id = resource->startAttributeUpdation(attributeName, type, -1, callback);
std::cout << "startUpdateAutomation() returned succces : " << id << std::endl;
}
// Select the automation to stop
std::vector<int> ids;
{
- std::vector<int> rids = resource->getResourceUpdationIds();
- std::vector<int> aids = resource->getAttributeUpdationIds();
+ std::vector<int> rids = resource->getResourceUpdations();
+ std::vector<int> aids = resource->getAttributeUpdations();
ids.insert(ids.end(), rids.begin(), rids.end());
ids.insert(ids.end(), aids.begin(), aids.end());
}
return;
}
- for (auto & id : ids)
+ for (auto &id : ids)
{
std::cout << id << " ";
resource->stopUpdation(id);
SimulatorSingleResourceSP resource = g_singleResources[index - 1];
- std::vector<ObserverInfo> observersList = resource->getObserversList();
+ std::vector<ObserverInfo> observersList = resource->getObservers();
std::cout << "##### Number of Observers [" << observersList.size() << "]" << std::endl;
- for (auto & observerInfo : observersList)
+ for (auto &observerInfo : observersList)
{
std::cout << " ID : " << (int) observerInfo.id << " [address: " <<
observerInfo.address << " port: " << observerInfo.port << "]" << std::endl;
std::cout << "7. Stop Automation" << std::endl;
std::cout << "8. Get Observers of a resource" << std::endl;
std::cout << "9. Set Logger" << std::endl;
- std::cout << "10. Help" << std::endl;
+ std::cout << "10. Set Device Info" << std::endl;
+ std::cout << "11. Set Platform Info" << std::endl;
+ std::cout << "12. Add Interface" << std::endl;
+ std::cout << "13. Help" << std::endl;
std::cout << "0. Exit" << std::endl;
std::cout << "######################################" << std::endl;
}
}
}
+void setDeviceInfo()
+{
+ try
+ {
+ SimulatorManager::getInstance()->setDeviceInfo("IoTivity Simulator Linux Sample");
+ std::cout << "Setting Device Info is successful" << std::endl;
+ }
+ catch (InvalidArgsException &e)
+ {
+ std::cout << "InvalidArgsException occured [code : " << e.code() << " Details: "
+ << e.what() << "]" << std::endl;
+ }
+ catch (SimulatorException &e)
+ {
+ std::cout << "SimulatorException occured [code : " << e.code() << " Details: "
+ << e.what() << "]" << std::endl;
+ }
+}
+
+void setPlatformInfo()
+{
+ PlatformInfo pInfo;
+ pInfo.setPlatformID("Samsung Platform Identifier");
+ pInfo.setFirmwareVersion("FirwareVersion01");
+ pInfo.setHardwareVersion("HardwareVersion01");
+ pInfo.setManufacturerName("Samsung");
+ pInfo.setManufacturerUrl("www.samsung.com");
+ pInfo.setModelNumber("Samsung Model Num01");
+ pInfo.setOSVersion("OSVersion01");
+ pInfo.setPlatformVersion("PlatformVersion01");
+ pInfo.setSupportUrl("http://www.samsung.com/support");
+ pInfo.setSystemTime("2015-09-10T11:10:30Z");
+ pInfo.setDateOfManfacture("2015-09-10T11:10:30Z");
+
+ try
+ {
+ SimulatorManager::getInstance()->setPlatformInfo(pInfo);
+ std::cout << "Setting Platform Info is successful" << std::endl;
+ }
+ catch (SimulatorException &e)
+ {
+ std::cout << "SimulatorException occured [code : " << e.code() << " Details: "
+ << e.what() << "]" << std::endl;
+ }
+}
+
+void addInterface()
+{
+
+ int index = selectResource();
+ if (-1 == index)
+ return;
+
+ SimulatorSingleResourceSP resource = g_singleResources[index - 1];
+ resource->addInterface("oic.if.s");
+ resource->addInterface("oic.if.a");
+}
+
int main(int argc, char *argv[])
{
printMainMenu();
int choice = -1;
std::cout << "Enter your choice: ";
std::cin >> choice;
- if (choice < 0 || choice > 10)
+ if (choice < 0 || choice > 14)
{
std::cout << "Invaild choice !" << std::endl; continue;
}
case 6 : automateAttributeUpdate(); break;
case 7 : stopAutomation(); break;
case 8 : getObservers(); break;
- case 9: setLogger(); break;
- case 10: printMainMenu(); break;
+ case 9 : setLogger(); break;
+ case 10: setDeviceInfo(); break;
+ case 11: setPlatformInfo(); break;
+ case 12: addInterface(); break;
+ case 13: printMainMenu(); break;
case 0: cont = false;
}
}
projects / platform / upstream / iotivity.git / blobdiff