amendmend to last commit

source/RobotAPI/interface/skills/SkillManagerInterface.ice

@@ -71,6 +71,9 @@ module armarx
                     string description;
                     FluxioIdentificator parentId;
                 };
+                
+                ["cpp:type:std::list<armarx::skills::manager::dto::FluxioProfile>", "python:seq:list"]
+                sequence<FluxioProfile> FluxioProfileList;
 
                 struct FluxioProvider
                 {
@@ -78,6 +81,9 @@ module armarx
                     string name;
                 };
 
+                ["cpp:type:std::list<armarx::skills::manager::dto::FluxioProvider>", "python:seq:list"]
+                sequence<FluxioProvider> FluxioProviderList;
+
                 struct FluxioValue
                 {
                     FluxioIdentificator profileId;
@@ -137,7 +143,7 @@ module armarx
                 };
 
                 ["cpp:type:std::list<armarx::skills::manager::dto::FluxioSkill>", "python:seq:list"]
-                sequence<dto::FluxioSkill> SkillList;
+                sequence<dto::FluxioSkill> FluxioSkillList;
 
                 struct ProviderInfo
                 {
@@ -190,8 +196,46 @@ module armarx
                     dto::SkillDescriptionMap
                     getSkillDescriptions(); // get all skilldescriptions from all providers
 
-                    dto::SkillList
+                    //** Fluxio related methods
+
+                    dto::FluxioSkillList // TODO: change name to FluxioSkillList (everywhere)
                     getSkillList(); // get all skills from all providers
+                    
+                    dto::FluxioSkill 
+                    getSkill(string id);
+
+                    void updateSkill(dto::FluxioSkill skill);
+
+                    //sequence<string> 
+                    void removeSkill(string id); // TODO: dry-run missing, return value needs to be handled correctly
+
+                    bool getSkillMutex(string skillId, string userId);
+                    void deleteSkillMutex(string skillId, string userId);
+
+                    void removeSkillParameter(string skillId, string parameterId); // TODO: implement dry-run
+
+                    dto::FluxioProfileList
+                    getProfileList();
+
+                    dto::FluxioProfile
+                    getProfile(string id);
+
+                    void createProfile(dto::FluxioProfile profile);
+                    void updateProfile(dto::FluxioProfile profile);
+
+                    dto::FluxioProviderList
+                    getProviderList();
+
+                    dto::FluxioProvider
+                    getProvider(string id);
+
+                    dto::FluxioSkillList
+                    getSkillsOfProvider(string id);
+
+                    dto::FluxioSkill
+                    addSkillToProvider(string providerId, dto::FluxioSkill skill);
+
+                    //** End of Fluxio related methods
 
                     optional(2) dto::SkillStatusUpdate
                     getSkillExecutionStatus(dto::SkillExecutionID executionId);

source/RobotAPI/libraries/skills/manager/SkillManagerComponentPlugin.cpp

 #include "SkillManagerComponentPlugin.h"
 
+#include <string>
 #include <ArmarXCore/core/Component.h>
 #include <ArmarXCore/core/time/DateTime.h>
 #include <ArmarXCore/core/time/ice_conversions.h>
@@ -454,6 +455,9 @@ namespace armarx::plugins
         return ret;
     }
 
+    //** Fluxio related methods
+    // TODO: trash
+
     std::list<skills::FluxioSkill>
     SkillManagerComponentPlugin::getSkillList()
     {
@@ -494,8 +498,60 @@ namespace armarx::plugins
         }
         
         return ret;
+    }    
+
+    skills::FluxioSkill SkillManagerComponentPlugin::getSkill(const std::string& id){
+        // TODO: take out the trash
+        skills::FluxioSkill ret;
+        return ret;
+    }
+
+    void SkillManagerComponentPlugin::updateSkill(const skills::FluxioSkill& skill){}
+
+    void SkillManagerComponentPlugin::removeSkill(const std::string& id){}
+
+    bool SkillManagerComponentPlugin::getSkillMutex(const std::string& skillId, const std::string& userId){
+        return false;
+    }
+
+    void SkillManagerComponentPlugin::deleteSkillMutex(const std::string& skillId, const std::string& userId){}
+
+    void SkillManagerComponentPlugin::removeSkillParameter(const std::string& skillId, const std::string& parameterId){}
+
+    std::list<skills::FluxioProfile> SkillManagerComponentPlugin::getProfileList(){
+        std::list<skills::FluxioProfile> ret;
+        return ret;
+    }
+
+    skills::FluxioProfile SkillManagerComponentPlugin::getProfile(const std::string& id){
+        skills::FluxioProfile ret;
+        return ret;
+    }
+
+    void SkillManagerComponentPlugin::createProfile(skills::FluxioProfile profile){}
+    void SkillManagerComponentPlugin::updateProfile(skills::FluxioProfile profile){}
+
+    std::list<skills::FluxioProvider> SkillManagerComponentPlugin::getProviderList(){
+        std::list<skills::FluxioProvider> ret;
+        return ret;
+    }
+
+    skills::FluxioProvider SkillManagerComponentPlugin::getProvider(const std::string& id){
+        skills::FluxioProvider ret;
+        return ret;
+    }
+
+    std::list<skills::FluxioSkill> SkillManagerComponentPlugin::getSkillsOfProvider(const std::string& id){
+        std::list<skills::FluxioSkill> ret;
+        return ret;
+    }
+
+    skills::FLuxioSkill SkillManagerComponentPlugin::addSkillToProvider(const std::string& providerId, const skills::FluxioSkill& skill){
+        return skill;
     }
 
+    //** end of Fluxio related methods
+
     std::optional<skills::SkillStatusUpdate>
     SkillManagerComponentPlugin::getSkillExecutionStatus(
         const skills::SkillExecutionID& executionId)
@@ -718,10 +774,12 @@ namespace armarx
         return {};
     }
 
-    skills::manager::dto::SkillList
+    //** Fluxio related methods
+    
+    skills::manager::dto::FluxioSkillList
     SkillManagerComponentPluginUser::getSkillList(const Ice::Current& current)
     {
-        skills::manager::dto::SkillList ret;
+        skills::manager::dto::FluxioSkillList ret;
 
         auto l = this->plugin->getSkillList();
 
@@ -733,6 +791,97 @@ namespace armarx
         return ret;
     }
 
+    skills::manager::dto::FluxioSkill 
+    SkillManagerComponentPluginUser::getSkill(const std::string& id,const Ice::Current& current){
+        return this->plugin->getSkill(id).toManagerIce();
+    }
+
+    void SkillManagerComponentPluginUser::updateSkill(const skills::manager::dto::FluxioSkill& skill,const Ice::Current& current){
+        this->plugin->updateSkill(skills::FluxioSkill::FromIce(skill));
+    }
+
+    void SkillManagerComponentPluginUser::removeSkill(const std::string& id,const Ice::Current& current){
+        this->plugin->removeSkill(id);
+    }
+
+    bool SkillManagerComponentPluginUser::getSkillMutex(const std::string& skillId, const std::string& userId,const Ice::Current& current){
+        return this->plugin->getSkillMutex(skillId, userId);
+    }
+    void SkillManagerComponentPluginUser::deleteSkillMutex(const std::string& skillId, const std::string& userId,const Ice::Current& current){
+        this->plugin->deleteSkillMutex(skillId, userId);
+    }
+
+    void SkillManagerComponentPluginUser::removeSkillParameter(const std::string& skillId, const std::string& parameterId,const Ice::Current& current){
+        this->plugin->removeSkillParameter(skillId, parameterId);
+    }
+
+    skills::manager::dto::FluxioProfileList
+    SkillManagerComponentPluginUser::getProfileList(const Ice::Current& current){
+        skills::manager::dto::FluxioProfileList ret;
+
+        auto l = this->plugin->getProfileList();
+
+        for (const auto& s : l)
+        {
+            ret.push_back(s.toManagerIce());
+        }
+
+        return ret;
+    }
+
+    skills::manager::dto::FluxioProfile 
+    SkillManagerComponentPluginUser::getProfile(const std::string& id,const Ice::Current& current){
+        return this->plugin->getProfile(id).toManagerIce();
+    }
+
+    void SkillManagerComponentPluginUser::createProfile(skills::manager::dto::FluxioProfile profile,const Ice::Current& current){
+        this->plugin->createProfile(skills::FluxioProfile::FromIce(profile));
+    }
+    void SkillManagerComponentPluginUser::updateProfile(skills::manager::dto::FluxioProfile profile,const Ice::Current& current){
+        this->plugin->updateProfile(skills::FluxioProfile::FromIce(profile));
+    }
+
+    skills::manager::dto::FluxioProviderList
+    SkillManagerComponentPluginUser::getProviderList(const Ice::Current& current){
+        skills::manager::dto::FluxioProviderList ret;
+
+        auto l = this->plugin->getProviderList();
+
+        for (const auto& s : l)
+        {
+            ret.push_back(s.toManagerIce());
+        }
+
+        return ret;
+    }
+
+    skills::manager::dto::FluxioProvider 
+    SkillManagerComponentPluginUser::getProvider(const std::string& id,const Ice::Current& current){
+        return this->plugin->getProvider(id).toManagerIce();
+    }
+
+    skills::manager::dto::FluxioSkillList
+    SkillManagerComponentPluginUser::getSkillsOfProvider(const std::string& id,const Ice::Current& current){
+        skills::manager::dto::FluxioSkillList ret;
+
+        auto l = this->plugin->getSkillsOfProvider(id);
+
+        for (const auto& s : l)
+        {
+            ret.push_back(s.toManagerIce());
+        }
+
+        return ret;
+    }
+
+    skills::manager::dto::FLuxioSkill 
+    SkillManagerComponentPluginUser::addSkillToProvider(const std::string& providerId,const skills::manager::dto::FluxioSkill& skill,const Ice::Current& current){
+        return this->plugin->addSkillToProvider(providerId, skills::FluxioSkill::FromIce(skill)).toManagerIce();
+    }
+      
+
+    //** end of Fluxio related methods
+
     IceUtil::Optional<skills::manager::dto::SkillStatusUpdate>
     SkillManagerComponentPluginUser::getSkillExecutionStatus(
         const skills::manager::dto::SkillExecutionID& executionId,

source/RobotAPI/libraries/skills/manager/SkillManagerComponentPlugin.h

@@ -2,11 +2,21 @@
 
 #include <mutex>
 #include <list>
+#include <string>
 #include <ArmarXCore/core/ComponentPlugin.h>
 #include <ArmarXCore/core/ManagedIceObject.h>
 
-#include <RobotAPI/libraries/skills/core/FluxioSkill.h>
 #include <RobotAPI/interface/skills/SkillManagerInterface.h>
+
+#include <RobotAPI/libraries/skills/core/FluxioIdentificator.h>
+#include <RobotAPI/libraries/skills/core/FluxioProfile.h>
+#include <RobotAPI/libraries/skills/core/FluxioValue.h>
+#include <RobotAPI/libraries/skills/core/FluxioProvider.h>
+#include <RobotAPI/libraries/skills/core/FluxioParameter.h>
+#include <RobotAPI/libraries/skills/core/FluxioNode.h>
+#include <RobotAPI/libraries/skills/core/FluxioEdge.h>
+#include <RobotAPI/libraries/skills/core/FluxioSkill.h>
+
 #include <RobotAPI/libraries/skills/core/ProviderID.h>
 #include <RobotAPI/libraries/skills/core/ProviderInfo.h>
 #include <RobotAPI/libraries/skills/core/SkillExecutionRequest.h>
@@ -49,8 +59,38 @@ namespace armarx::plugins
 
         std::map<skills::SkillID, skills::SkillDescription> getSkillDescriptions();
 
+        //** Fluxio related methods
+
         std::list<skills::FluxioSkill> getSkillList();
 
+        skills::FluxioSkill getSkill(const std::string& id);
+
+        void updateSkill(const skills::FluxioSkill& skill);
+
+        void removeSkill(const std::string& id);
+
+        bool getSkillMutex(const std::string& skillId, const std::string& userId);
+        void deleteSkillMutex(const std::string& skillId, const std::string& userId);
+
+        void removeSkillParameter(const std::string& skillId, const std::string& parameterId);
+
+        std::list<skills::FluxioProfile> getProfileList();
+
+        skills::FluxioProfile getProfile(const std::string& id);
+
+        void createProfile(skills::FluxioProfile profile);
+        void updateProfile(skills::FluxioProfile profile);
+
+        std::list<skills::FluxioProvider> getProviderList();
+
+        skills::FluxioProvider getProvider(const std::string& id);
+
+        std::list<skills::FluxioSkill> getSkillsOfProvider(const std::string& id);
+
+        skills::FLuxioSkill addSkillToProvider(const std::string& providerId, const skills::FluxioSkill& skill); // TODO: fix 'does not name a type' error
+
+        //** end of Fluxio related methods
+
         std::optional<skills::SkillStatusUpdate>
         getSkillExecutionStatus(const skills::SkillExecutionID& id);
 
@@ -116,9 +156,47 @@ namespace armarx
         getSkillDescription(const skills::manager::dto::SkillID& id,
                             const Ice::Current& current) override;
 
-        skills::manager::dto::SkillList 
+
+        //** Fluxio related methods
+
+        skills::manager::dto::FluxioSkillList 
         getSkillList(const Ice::Current& current) override;
 
+        skills::manager::dto::FluxioSkill 
+        getSkill(const std::string& id,const Ice::Current& current) override;
+
+        void updateSkill(const skills::manager::dto::FluxioSkill& skill,const Ice::Current& current) override;
+
+        void removeSkill(const std::string& id,const Ice::Current& current) override;
+
+        bool getSkillMutex(const std::string& skillId, const std::string& userId,const Ice::Current& current) override;
+        void deleteSkillMutex(const std::string& skillId, const std::string& userId,const Ice::Current& current) override;
+
+        void removeSkillParameter(const std::string& skillId, const std::string& parameterId,const Ice::Current& current) override;
+
+        skills::manager::dto::FluxioProfileList
+        getProfileList(const Ice::Current& current) override;
+
+        skills::manager::dto::FluxioProfile 
+        getProfile(const std::string& id,const Ice::Current& current) override;
+
+        void createProfile(skills::manager::dto::FluxioProfile profile,const Ice::Current& current) override;
+        void updateProfile(skills::manager::dto::FluxioProfile profile,const Ice::Current& current) override;
+
+        skills::manager::dto::FluxioProviderList
+        getProviderList(const Ice::Current& current) override;
+
+        skills::manager::dto::FluxioProvider 
+        getProvider(const std::string& id,const Ice::Current& current) override;
+
+        skills::manager::dto::FluxioSkillList
+        getSkillsOfProvider(const std::string& id,const Ice::Current& current) override;
+
+        skills::manager::dto::FLuxioSkill 
+        addSkillToProvider(const std::string& providerId,const skills::manager::dto::FluxioSkill& skill,const Ice::Current& current) override;
+
+        //** end of Fluxio related methods
+
         IceUtil::Optional<skills::manager::dto::SkillStatusUpdate>
         getSkillExecutionStatus(const skills::manager::dto::SkillExecutionID& executionId,
                                 const Ice::Current& current) override;