Signed-off-by: Bin Yang <bin.yang@windriver.com>
Change-Id: I4b2fc706fec47ce595b13b65eced0d40128d85d6
- ./o2common:/o2common
- ./tests:/tests
entrypoint:
- ./o2common:/o2common
- ./tests:/tests
entrypoint:
- - python
- - /o2ims/entrypoints/redis_eventconsumer.py
+ - /bin/sh
+ - /o2ims/entrypoints/o2ims-redis-entry.sh
api:
image: o2imsdms-image
api:
image: o2imsdms-image
return self.driver.getK8sDetail(name)\r
\r
def _list(self, **filters):\r
return self.driver.getK8sDetail(name)\r
\r
def _list(self, **filters):\r
- return self.driver.getK8sList(filters)\r
+ return self.driver.getK8sList(**filters)\r
\r
\r
class StxPserverClient(BaseClient):\r
\r
\r
class StxPserverClient(BaseClient):\r
return self.driver.getPserver(id)\r
\r
def _list(self, **filters) -> List[ocloudModel.StxGenericModel]:\r
return self.driver.getPserver(id)\r
\r
def _list(self, **filters) -> List[ocloudModel.StxGenericModel]:\r
- return self.driver.getPserverList(filters)\r
+ return self.driver.getPserverList(**filters)\r
\r
\r
class StxCpuClient(BaseClient):\r
\r
\r
class StxCpuClient(BaseClient):\r
return self.driver.getCpu(id)\r
\r
def _list(self, **filters) -> List[ocloudModel.StxGenericModel]:\r
return self.driver.getCpu(id)\r
\r
def _list(self, **filters) -> List[ocloudModel.StxGenericModel]:\r
- return self.driver.getCpuList(filters)\r
+ return self.driver.getCpuList(**filters)\r
\r
# internal driver which implement client call to Stx Standalone instance\r
\r
\r
# internal driver which implement client call to Stx Standalone instance\r
\r
\r
def getCpuList(self, **filters) -> List[ocloudModel.StxGenericModel]:\r
hostid = filters.get("hostid", None)\r
\r
def getCpuList(self, **filters) -> List[ocloudModel.StxGenericModel]:\r
hostid = filters.get("hostid", None)\r
+ assert (hostid is not None), "missing hostid to query icpu list"\r
cpulist = self.stxclient.icpu.list(hostid)\r
return [ocloudModel.StxGenericModel(\r
cpulist = self.stxclient.icpu.list(hostid)\r
return [ocloudModel.StxGenericModel(\r
- ResourceTypeEnum.OCLOUD,\r
+ ResourceTypeEnum.PSERVER_CPU,\r
self._cpuconverter(cpures)) for cpures in cpulist if cpures]\r
\r
def getCpu(self, id) -> ocloudModel.StxGenericModel:\r
cpuinfo = self.stxclient.icpu.get(id)\r
return ocloudModel.StxGenericModel(\r
self._cpuconverter(cpures)) for cpures in cpulist if cpures]\r
\r
def getCpu(self, id) -> ocloudModel.StxGenericModel:\r
cpuinfo = self.stxclient.icpu.get(id)\r
return ocloudModel.StxGenericModel(\r
- ResourceTypeEnum.OCLOUD, self._cpuconverter(cpuinfo))\r
+ ResourceTypeEnum.PSERVER_CPU, self._cpuconverter(cpuinfo))\r
\r
def _getIsystems(self):\r
return self.stxclient.isystem.list()\r
\r
def _getIsystems(self):\r
return self.stxclient.isystem.list()\r
--- /dev/null
+#!/bin/sh
+
+# pip install -e /src
+# python /o2ims/entrypoints/resource_watcher.py
+
+cp -r /o2ims/* /src/o2ims
+pip install -e /src
+python /o2ims/entrypoints/redis_eventconsumer.py
pass\r
\r
def list(self, **filters) -> List[ocloudModel.StxGenericModel]:\r
pass\r
\r
def list(self, **filters) -> List[ocloudModel.StxGenericModel]:\r
- return self._list(filters)\r
+ return self._list(**filters)\r
\r
def get(self, id) -> ocloudModel.StxGenericModel:\r
return self._get(id)\r
\r
def get(self, id) -> ocloudModel.StxGenericModel:\r
return self._get(id)\r
return\r
\r
for res in resources:\r
return\r
\r
for res in resources:\r
- for node in self.children:\r
- node.probe(res, childdepth)\r
+ for targetname in self.children.keys():\r
+ self.children[targetname].probe(res, childdepth)\r