fix: Typo in the *feed methods

pull/232/head
Raphaël Vinot 2018-04-26 14:41:20 +02:00
parent 21f1a64293
commit e568a0cf00
2 changed files with 25 additions and 6 deletions

19
examples/add_feed.py Executable file
View File

@ -0,0 +1,19 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
from pymisp import PyMISP
from keys import misp_url, misp_key, misp_verifycert
import argparse
if __name__ == '__main__':
parser = argparse.ArgumentParser(description='Add a feed')
parser.add_argument("-f", "--format", required=True, choices=['misp', 'csv', 'freetext'], help="Feed source format")
parser.add_argument("-u", "--url", required=True, help="URL, or local path")
parser.add_argument("-n", "--name", required=True, help="Name of the feed")
parser.add_argument("-i", "--input", required=True, choices=['local', 'network'], help="URL, or local path")
parser.add_argument("-p", "--provider", required=True, help="Provider name")
args = parser.parse_args()
pm = PyMISP(misp_url, misp_key, misp_verifycert, debug=True)
response = pm.add_feed(args.format, args.url, args.name, args.input, args.provider)
print(response)

View File

@ -1754,31 +1754,31 @@ class PyMISP(object):
def get_feeds_list(self):
"""Get the content of all the feeds"""
return self._rest_list('feed')
return self._rest_list('feeds')
def get_feed(self, feed_id):
"""Get the content of a single feed"""
return self._rest_view('feed', feed_id)
return self._rest_view('feeds', feed_id)
def add_feed(self, source_format, url, name, input_source, provider, **kwargs):
"""Delete a feed"""
new_feed = MISPFeed()
new_feed.from_dict(source_format=source_format, url=url, name=name,
input_source=input_source, provider=provider)
return self._rest_add('feed', new_feed)
return self._rest_add('feeds', new_feed)
def get_feed_fields_list(self):
return self._rest_get_parameters('feed')
return self._rest_get_parameters('feeds')
def edit_feed(self, feed_id, **kwargs):
"""Delete a feed"""
edit_feed = MISPFeed()
edit_feed.from_dict(**kwargs)
return self._rest_edit('feed', edit_feed)
return self._rest_edit('feeds', edit_feed)
def delete_feed(self, feed_id):
"""Delete a feed"""
return self._rest_delete('feed', feed_id)
return self._rest_delete('feeds', feed_id)
def fetch_feed(self, feed_id):
"""Fetch one single feed"""