commit de62ba7761bade8e2718ae6cc5093664f146bf81
author Andy Bavier <andy@opennetworking.org> Thu Feb 27 14:12:30 2020 -0700
committer Andy Bavier <andy@opennetworking.org> Thu Feb 27 14:22:50 2020 -0700
tree 402404f72d4979e9c2c65f141350943b87f6652b
parent 95032206d642b62f76eb32f498748c65a91c6b7a

VOL-2677 Fix 'make gendocs'

Change-Id: I1ca24b3f117355d8aa91c1c09f17f45aea4ea008

Makefile

diff --git a/Makefile b/Makefile
index 34f4bd3..f6fd912 100644
--- a/Makefile
+++ b/Makefile
@@ -101,22 +101,29 @@
   python -m robot.tidy --inplace $(ROBOT_FILES);
 
 ## Variables for gendocs
-TEST_SOURCE := $(wildcard tests/*/*.robot)
+TEST_SOURCE := $(wildcard src/test/cord-api/Tests/*/*.robot)
 TEST_BASENAME := $(basename $(TEST_SOURCE))
 TEST_DIRS := $(dir $(TEST_SOURCE))
 
-LIB_SOURCE := $(wildcard libraries/*.robot)
-LIB_BASENAME := $(basename $(LIB_SOURCE))
-LIB_DIRS := $(dir $(LIB_SOURCE))
+PYLIB_SOURCE := $(filter-out cord-robot/CORDRobot/__init__.py, $(wildcard cord-robot/CORDRobot/*.py))
+PYLIB_BASENAME := $(basename $(PYLIB_SOURCE))
+PYLIB_DIRS := $(dir $(PYLIB_SOURCE))
+
+RESOURCE_SOURCE := $(wildcard cord-robot/CORDRobot/rf-resources/*.resource)
+RESOURCE_BASENAME := $(basename $(RESOURCE_SOURCE))
+RESOURCE_DIRS := $(dir $(RESOURCE_SOURCE))
 
 .PHONY: gendocs lint test
-# In future explore use of --docformat REST - integration w/Sphinx?
 gendocs: venv_cord
 	source ./$</bin/activate ; set -u ;\
   mkdir -p $@ ;\
-  for dir in ${LIB_DIRS}; do mkdir -p $@/$$dir; done;\
-  for dir in ${LIB_BASENAME}; do\
-    python -m robot.libdoc --format HTML $$dir.robot $@/$$dir.html ;\
+  for dir in ${PYLIB_DIRS}; do mkdir -p $@/$$dir; done;\
+  for dir in ${PYLIB_BASENAME}; do\
+    python -m robot.libdoc --format HTML $$dir.py $@/$$dir.html ;\
+  done ;\
+  for dir in ${RESOURCE_DIRS}; do mkdir -p $@/$$dir; done;\
+  for dir in ${RESOURCE_BASENAME}; do\
+    python -m robot.libdoc --format HTML $$dir.resource $@/$$dir.html ;\
   done ;\
   for dir in ${TEST_DIRS}; do mkdir -p $@/$$dir; done;\
   for dir in ${TEST_BASENAME}; do\

VERSION

diff --git a/VERSION b/VERSION
index 3e3c2f1..47e1d8b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1.1
+2.1.2-dev0

src/test/cord-api/Tests/WorkflowValidations/ATT_Test001.robot

diff --git a/src/test/cord-api/Tests/WorkflowValidations/ATT_Test001.robot b/src/test/cord-api/Tests/WorkflowValidations/ATT_Test001.robot
index 7bc579a..092875e 100644
--- a/src/test/cord-api/Tests/WorkflowValidations/ATT_Test001.robot
+++ b/src/test/cord-api/Tests/WorkflowValidations/ATT_Test001.robot
@@ -25,7 +25,7 @@
 Library           RequestsLibrary
 Library           CORDRobot
 Library           ImportResource  resources=CORDRobot
-ariables         ../../Properties/RestApiProperties.py
+Variables         ../../Properties/RestApiProperties.py
 
 *** Variables ***
 ${POD_NAME}                 flex-pod1-olt