X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FIM.git;a=blobdiff_plain;f=setup.py;h=dfa5cee57b5391ccd67dddbefb9020a0c738beff;hp=f59e790780083a3f52ea8196bda3581fc6259486;hb=2eccea2a6533769f4c787c183437de65b0f46f69;hpb=308422682bf5b5d0def81adb5220069707237c0d diff --git a/setup.py b/setup.py index f59e790..dfa5cee 100644 --- a/setup.py +++ b/setup.py @@ -35,20 +35,9 @@ class Install_osm_im(install): import pyangbind print("Using dir {}/{} for python artifacts".format(os.getcwd(), self.im_dir)) path = "{}/{}".format(os.getcwd(), self.im_dir) - for files_item in ['vnfd', 'nsd', 'nst']: - protoc_command = ["pyang", - "-Werror", - "--plugindir", - "{}/plugin".format(os.path.dirname(pyangbind.__file__)), - "--path", - self.model_dir, - "-f", "pybind", - "-o", - "{}/{}.py".format(self.im_dir, files_item), - "{}/{}.yang".format(self.model_dir, files_item)] - print("Generating {}.py from {}.yang".format(files_item, files_item)) - if subprocess.call(protoc_command) != 0: - sys.exit(-1) + protoc_command = ["make", "models"] + if subprocess.call(protoc_command) != 0: + sys.exit(-1) # To ensure generated files are copied to the python installation folder self.copy_tree(self.im_dir, "{}{}".format(self.install_lib, self.im_dir)) install.run(self)